From 3721e9e0ad1cb0c4f227a1561a41de49cb615140 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Thu, 7 Dec 2023 16:56:43 +0100 Subject: [PATCH] renamed variable --- group_vars/all | 2 +- roles/docker-akaunting/README.md | 2 +- roles/docker-akaunting/vars/main.yml | 2 +- roles/docker-attendize/vars/main.yml | 2 +- roles/docker-baserow/handlers/main.yml | 2 +- roles/docker-baserow/vars/main.yml | 2 +- roles/docker-bigbluebutton/vars/main.yml | 2 +- roles/docker-funkwhale/vars/main.yml | 2 +- roles/docker-gitea/vars/main.yml | 2 +- roles/docker-joomla/vars/main.yml | 2 +- roles/docker-listmonk/handlers/main.yml | 2 +- roles/docker-listmonk/vars/main.yml | 2 +- roles/docker-mailu/tasks/main.yml | 4 ++-- roles/docker-mailu/vars/main.yml | 2 +- roles/docker-mastodon/README.md | 6 +++--- roles/docker-mastodon/vars/main.yml | 2 +- roles/docker-matomo/README.md | 2 +- roles/docker-matomo/vars/main.yml | 2 +- roles/docker-mybb/vars/main.yml | 2 +- roles/docker-nextcloud/README.md | 2 +- roles/docker-nextcloud/vars/main.yml | 2 +- roles/docker-peertube/README.md | 2 +- roles/docker-peertube/vars/main.yml | 2 +- roles/docker-pixelfed/README.md | 2 +- roles/docker-pixelfed/handlers/main.yml | 2 +- roles/docker-pixelfed/vars/main.yml | 2 +- roles/docker-roulette-wheel/vars/main.yml | 4 ++-- roles/docker-wordpress/vars/main.yml | 2 +- roles/docker-yourls/vars/main.yml | 2 +- roles/docker/tasks/main.yml | 4 ++-- roles/update-docker/templates/update-docker.service.j2 | 2 +- roles/update/tasks/main.yml | 4 ++-- 32 files changed, 38 insertions(+), 38 deletions(-) diff --git a/group_vars/all b/group_vars/all index d86e4af8..44605668 100644 --- a/group_vars/all +++ b/group_vars/all @@ -29,7 +29,7 @@ size_percent_cleanup_disc_space: 90 path_administrator_home: "/home/administrator/" path_administrator_scripts: "{{path_administrator_home}}scripts/" path_docker_volumes: "{{path_administrator_home}}volumes/docker/" -docker_compose_instances_directory: "{{path_administrator_home}}docker-compose/" +path_docker_compose_instances: "{{path_administrator_home}}docker-compose/" # Runtime Variables activate_all_timers (bool): false # Activates all timers, independend if the handlers had been triggered diff --git a/roles/docker-akaunting/README.md b/roles/docker-akaunting/README.md index 6ef7e5cd..14fab794 100644 --- a/roles/docker-akaunting/README.md +++ b/roles/docker-akaunting/README.md @@ -19,7 +19,7 @@ Due to license issues, bugs and that in the past after an akaunting update your 1. **Navigate to Docker Compose Directory**: Change to the directory containing your Docker Compose files for Akaunting. ```bash - cd {{docker_compose_instances_directory}}akaunting/ + cd {{path_docker_compose_instances}}akaunting/ ``` 2. **Set Environment Variables**: These are necessary to prevent timeouts during long operations. diff --git a/roles/docker-akaunting/vars/main.yml b/roles/docker-akaunting/vars/main.yml index 06efb319..4644f7d3 100644 --- a/roles/docker-akaunting/vars/main.yml +++ b/roles/docker-akaunting/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{docker_compose_instances_directory}}akaunting/" +docker_compose_instance_directory: "{{path_docker_compose_instances}}akaunting/" diff --git a/roles/docker-attendize/vars/main.yml b/roles/docker-attendize/vars/main.yml index 741d1608..e3e8c7cb 100644 --- a/roles/docker-attendize/vars/main.yml +++ b/roles/docker-attendize/vars/main.yml @@ -1,3 +1,3 @@ --- -docker_compose_instance_directory: "{{docker_compose_instances_directory}}attendize/" +docker_compose_instance_directory: "{{path_docker_compose_instances}}attendize/" mail_interface_domain: "mail.{{domain}}" diff --git a/roles/docker-baserow/handlers/main.yml b/roles/docker-baserow/handlers/main.yml index 3e37556d..c508f4ef 100644 --- a/roles/docker-baserow/handlers/main.yml +++ b/roles/docker-baserow/handlers/main.yml @@ -2,7 +2,7 @@ - name: recreate baserow command: cmd: docker-compose -p baserow up -d --force-recreate - chdir: "{{docker_compose_instances_directory}}baserow/" + chdir: "{{path_docker_compose_instances}}baserow/" environment: COMPOSE_HTTP_TIMEOUT: 600 DOCKER_CLIENT_TIMEOUT: 600 diff --git a/roles/docker-baserow/vars/main.yml b/roles/docker-baserow/vars/main.yml index 9c98e0d7..eb1c8010 100644 --- a/roles/docker-baserow/vars/main.yml +++ b/roles/docker-baserow/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{docker_compose_instances_directory}}baserow/" \ No newline at end of file +docker_compose_instance_directory: "{{path_docker_compose_instances}}baserow/" \ No newline at end of file diff --git a/roles/docker-bigbluebutton/vars/main.yml b/roles/docker-bigbluebutton/vars/main.yml index edafc84f..9b40ea81 100644 --- a/roles/docker-bigbluebutton/vars/main.yml +++ b/roles/docker-bigbluebutton/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{docker_compose_instances_directory}}bigbluebutton/" \ No newline at end of file +docker_compose_instance_directory: "{{path_docker_compose_instances}}bigbluebutton/" \ No newline at end of file diff --git a/roles/docker-funkwhale/vars/main.yml b/roles/docker-funkwhale/vars/main.yml index b65f6013..fe67f9b4 100644 --- a/roles/docker-funkwhale/vars/main.yml +++ b/roles/docker-funkwhale/vars/main.yml @@ -1,2 +1,2 @@ -docker_compose_instance_directory: "{{docker_compose_instances_directory}}funkwhale/" +docker_compose_instance_directory: "{{path_docker_compose_instances}}funkwhale/" client_max_body_size: "512M" diff --git a/roles/docker-gitea/vars/main.yml b/roles/docker-gitea/vars/main.yml index 1e663c61..a029ab64 100644 --- a/roles/docker-gitea/vars/main.yml +++ b/roles/docker-gitea/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{docker_compose_instances_directory}}gitea/" +docker_compose_instance_directory: "{{path_docker_compose_instances}}gitea/" diff --git a/roles/docker-joomla/vars/main.yml b/roles/docker-joomla/vars/main.yml index 30a906ea..49af5787 100644 --- a/roles/docker-joomla/vars/main.yml +++ b/roles/docker-joomla/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{docker_compose_instances_directory}}joomla/" +docker_compose_instance_directory: "{{path_docker_compose_instances}}joomla/" diff --git a/roles/docker-listmonk/handlers/main.yml b/roles/docker-listmonk/handlers/main.yml index 286bef09..747b0bc5 100644 --- a/roles/docker-listmonk/handlers/main.yml +++ b/roles/docker-listmonk/handlers/main.yml @@ -2,7 +2,7 @@ - name: recreate listmonk command: cmd: docker-compose -p listmonk up -d --force-recreate - chdir: "{{docker_compose_instances_directory}}listmonk/" + chdir: "{{path_docker_compose_instances}}listmonk/" environment: COMPOSE_HTTP_TIMEOUT: 600 DOCKER_CLIENT_TIMEOUT: 600 diff --git a/roles/docker-listmonk/vars/main.yml b/roles/docker-listmonk/vars/main.yml index ef1a09a8..75a5cf4f 100644 --- a/roles/docker-listmonk/vars/main.yml +++ b/roles/docker-listmonk/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{docker_compose_instances_directory}}listmonk/" +docker_compose_instance_directory: "{{path_docker_compose_instances}}listmonk/" diff --git a/roles/docker-mailu/tasks/main.yml b/roles/docker-mailu/tasks/main.yml index fe93dd73..26fedd3f 100644 --- a/roles/docker-mailu/tasks/main.yml +++ b/roles/docker-mailu/tasks/main.yml @@ -4,9 +4,9 @@ vars: client_max_body_size: "31M" -- name: "create {{docker_compose_instances_directory}}mailu" +- name: "create {{path_docker_compose_instances}}mailu" file: - path: "{{docker_compose_instances_directory}}mailu" + path: "{{path_docker_compose_instances}}mailu" state: directory mode: 0755 diff --git a/roles/docker-mailu/vars/main.yml b/roles/docker-mailu/vars/main.yml index 85d5c496..27b1f5a5 100644 --- a/roles/docker-mailu/vars/main.yml +++ b/roles/docker-mailu/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{docker_compose_instances_directory}}mailu/" \ No newline at end of file +docker_compose_instance_directory: "{{path_docker_compose_instances}}mailu/" \ No newline at end of file diff --git a/roles/docker-mastodon/README.md b/roles/docker-mastodon/README.md index d2b4b113..2d1dd775 100644 --- a/roles/docker-mastodon/README.md +++ b/roles/docker-mastodon/README.md @@ -5,11 +5,11 @@ ``` ## cleanup ```bash -cd {{docker_compose_instances_directory}}mastodon/ +cd {{path_docker_compose_instances}}mastodon/ docker-compose down docker volume rm mastodon_data mastodon_database mastodon_redis -cd {{docker_compose_instances_directory}} && -rm -vR {{docker_compose_instances_directory}}mastodon +cd {{path_docker_compose_instances}} && +rm -vR {{path_docker_compose_instances}}mastodon ``` ## access terminal diff --git a/roles/docker-mastodon/vars/main.yml b/roles/docker-mastodon/vars/main.yml index d6893ba3..4ccb7d3e 100644 --- a/roles/docker-mastodon/vars/main.yml +++ b/roles/docker-mastodon/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{docker_compose_instances_directory}}mastodon/" +docker_compose_instance_directory: "{{path_docker_compose_instances}}mastodon/" diff --git a/roles/docker-matomo/README.md b/roles/docker-matomo/README.md index efac16f7..8e2df4d2 100644 --- a/roles/docker-matomo/README.md +++ b/roles/docker-matomo/README.md @@ -12,7 +12,7 @@ This Ansible role deploys a Matomo analytics platform instance using Docker. - `domain`: The domain where Matomo will be accessible. - `administrator_email`: The email used for SSL certificate registration. -- `docker_compose_instances_directory`: Path to store Docker Compose files. +- `path_docker_compose_instances`: Path to store Docker Compose files. - `http_port`: The host port that Matomo will be accessible on. - `matomo_database_password`: Password for the Matomo database. diff --git a/roles/docker-matomo/vars/main.yml b/roles/docker-matomo/vars/main.yml index 6e3581df..3adfaaad 100644 --- a/roles/docker-matomo/vars/main.yml +++ b/roles/docker-matomo/vars/main.yml @@ -1,2 +1,2 @@ --- -docker_compose_instance_directory: "{{docker_compose_instances_directory}}matomo/" \ No newline at end of file +docker_compose_instance_directory: "{{path_docker_compose_instances}}matomo/" \ No newline at end of file diff --git a/roles/docker-mybb/vars/main.yml b/roles/docker-mybb/vars/main.yml index 0a54dd9e..02445e66 100644 --- a/roles/docker-mybb/vars/main.yml +++ b/roles/docker-mybb/vars/main.yml @@ -1,5 +1,5 @@ --- -docker_compose_instance_directory: "{{docker_compose_instances_directory}}mybb/" +docker_compose_instance_directory: "{{path_docker_compose_instances}}mybb/" docker_compose_instance_confd_directory: "{{docker_compose_instance_directory}}conf.d/" docker_compose_instance_confd_defaultconf_file: "{{docker_compose_instance_confd_directory}}default.conf" target_mount_conf_d_directory: "/etc/nginx/conf.d/" diff --git a/roles/docker-nextcloud/README.md b/roles/docker-nextcloud/README.md index e2fa527c..2bb8edb2 100644 --- a/roles/docker-nextcloud/README.md +++ b/roles/docker-nextcloud/README.md @@ -57,7 +57,7 @@ and disable the not functioning apps. ## recover latest backup ```bash -cd {{docker_compose_instances_directory}}nextcloud && +cd {{path_docker_compose_instances}}nextcloud && docker-compose down && docker-compose exec -i database mysql -u nextcloud -pPASSWORT nextcloud < "/Backups/$(sha256sum /etc/machine-id | head -c 64)/backup-docker-to-local/latest/nextcloud_database/sql/backup.sql" && cd {{path_administrator_scripts}}backup-docker-to-local && diff --git a/roles/docker-nextcloud/vars/main.yml b/roles/docker-nextcloud/vars/main.yml index d0779010..7b09fc97 100644 --- a/roles/docker-nextcloud/vars/main.yml +++ b/roles/docker-nextcloud/vars/main.yml @@ -1,2 +1,2 @@ --- -docker_compose_instance_directory: "{{docker_compose_instances_directory}}nextcloud/" \ No newline at end of file +docker_compose_instance_directory: "{{path_docker_compose_instances}}nextcloud/" \ No newline at end of file diff --git a/roles/docker-peertube/README.md b/roles/docker-peertube/README.md index 784925ed..8e5f840e 100644 --- a/roles/docker-peertube/README.md +++ b/roles/docker-peertube/README.md @@ -7,7 +7,7 @@ watch -n 2 "docker ps -a | grep peertube" ## clean rebuild ```bash -cd {{docker_compose_instances_directory}}peertube/ && +cd {{path_docker_compose_instances}}peertube/ && docker-compose down docker volume rm peertube_assets peertube_config peertube_data peertube_database peertube_redis docker-compose up -d diff --git a/roles/docker-peertube/vars/main.yml b/roles/docker-peertube/vars/main.yml index 672fbf42..2eec12de 100644 --- a/roles/docker-peertube/vars/main.yml +++ b/roles/docker-peertube/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{docker_compose_instances_directory}}peertube/" +docker_compose_instance_directory: "{{path_docker_compose_instances}}peertube/" diff --git a/roles/docker-pixelfed/README.md b/roles/docker-pixelfed/README.md index cd1bd31e..dee4be76 100644 --- a/roles/docker-pixelfed/README.md +++ b/roles/docker-pixelfed/README.md @@ -49,7 +49,7 @@ docker volume rm pixelfed_application_data pixelfed_database pixelfed_redis_data To update your Pixelfed instance, navigate to the directory where your `docker-compose.yml` file is located and run these commands: ```bash -cd {{docker_compose_instances_directory}}pixelfed/ && +cd {{path_docker_compose_instances}}pixelfed/ && docker-compose down && docker network prune -f && docker-compose pull && diff --git a/roles/docker-pixelfed/handlers/main.yml b/roles/docker-pixelfed/handlers/main.yml index 734fbd45..f2c134e8 100644 --- a/roles/docker-pixelfed/handlers/main.yml +++ b/roles/docker-pixelfed/handlers/main.yml @@ -2,7 +2,7 @@ - name: recreate pixelfed command: cmd: docker-compose -p pixelfed up -d --force-recreate - chdir: "{{docker_compose_instances_directory}}pixelfed/" + chdir: "{{path_docker_compose_instances}}pixelfed/" environment: COMPOSE_HTTP_TIMEOUT: 600 DOCKER_CLIENT_TIMEOUT: 600 diff --git a/roles/docker-pixelfed/vars/main.yml b/roles/docker-pixelfed/vars/main.yml index 8401f979..976ab2df 100644 --- a/roles/docker-pixelfed/vars/main.yml +++ b/roles/docker-pixelfed/vars/main.yml @@ -1,2 +1,2 @@ -docker_compose_instance_directory: "{{docker_compose_instances_directory}}pixelfed/" +docker_compose_instance_directory: "{{path_docker_compose_instances}}pixelfed/" client_max_body_size: "512M" diff --git a/roles/docker-roulette-wheel/vars/main.yml b/roles/docker-roulette-wheel/vars/main.yml index 8db7cdee..f081efb9 100644 --- a/roles/docker-roulette-wheel/vars/main.yml +++ b/roles/docker-roulette-wheel/vars/main.yml @@ -1,2 +1,2 @@ -docker_compose_instance_directory: "{{docker_compose_instances_directory}}roulette-wheel/" -app_path: "{{docker_compose_instances_directory}}roulette-wheel/app/" \ No newline at end of file +docker_compose_instance_directory: "{{path_docker_compose_instances}}roulette-wheel/" +app_path: "{{path_docker_compose_instances}}roulette-wheel/app/" \ No newline at end of file diff --git a/roles/docker-wordpress/vars/main.yml b/roles/docker-wordpress/vars/main.yml index 50b25d30..61f40599 100644 --- a/roles/docker-wordpress/vars/main.yml +++ b/roles/docker-wordpress/vars/main.yml @@ -1,2 +1,2 @@ -docker_compose_instance_directory: "{{docker_compose_instances_directory}}wordpress/" +docker_compose_instance_directory: "{{path_docker_compose_instances}}wordpress/" wordpress_max_upload_size: "64M" diff --git a/roles/docker-yourls/vars/main.yml b/roles/docker-yourls/vars/main.yml index f8d09cad..02676317 100644 --- a/roles/docker-yourls/vars/main.yml +++ b/roles/docker-yourls/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{docker_compose_instances_directory}}yourls/" \ No newline at end of file +docker_compose_instance_directory: "{{path_docker_compose_instances}}yourls/" \ No newline at end of file diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 0ab1c2bb..159f0a63 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -6,9 +6,9 @@ state: present notify: docker restart -- name: "create {{docker_compose_instances_directory}}" +- name: "create {{path_docker_compose_instances}}" file: - path: "{{docker_compose_instances_directory}}" + path: "{{path_docker_compose_instances}}" state: directory mode: 0700 owner: administrator diff --git a/roles/update-docker/templates/update-docker.service.j2 b/roles/update-docker/templates/update-docker.service.j2 index 4c1d19d5..cbc1ba8c 100644 --- a/roles/update-docker/templates/update-docker.service.j2 +++ b/roles/update-docker/templates/update-docker.service.j2 @@ -4,4 +4,4 @@ OnFailure=systemd-notifier@%n.service [Service] Type=oneshot -ExecStart=/bin/sh -c '/usr/bin/python {{update_docker_script}} {{docker_compose_instances_directory}}' \ No newline at end of file +ExecStart=/bin/sh -c '/usr/bin/python {{update_docker_script}} {{path_docker_compose_instances}}' \ No newline at end of file diff --git a/roles/update/tasks/main.yml b/roles/update/tasks/main.yml index 7c414087..51a33951 100644 --- a/roles/update/tasks/main.yml +++ b/roles/update/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "Check if {{ docker_compose_instances_directory }} directory exists" +- name: "Check if {{ path_docker_compose_instances }} directory exists" stat: - path: "{{ docker_compose_instances_directory }}" + path: "{{ path_docker_compose_instances }}" register: docker_compose_directory_stat - name: "Update with pacman"