From fe77fb623ef744a2fe8baf7b7d9adb87aebe5f97 Mon Sep 17 00:00:00 2001 From: Kevin Veen-Birkenbach Date: Thu, 7 Dec 2023 15:35:57 +0100 Subject: [PATCH] Updated mybb README.md, renamed variables, solved mybb bug --- 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/README.md | 58 ++++++++++++++++--- roles/docker-mybb/tasks/main.yml | 8 +-- roles/docker-mybb/templates/default.conf | 8 --- .../templates/docker-compose.yml.j2 | 4 +- roles/docker-mybb/vars/main.yml | 8 +-- 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 +- .../templates/update-docker.service.j2 | 2 +- roles/update/tasks/main.yml | 4 +- 36 files changed, 97 insertions(+), 63 deletions(-) diff --git a/group_vars/all b/group_vars/all index b6cad69d..d86e4af8 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/" -path_docker_compose_files: "{{path_administrator_home}}docker-compose/" +docker_compose_instances_directory: "{{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 0ceecc90..6ef7e5cd 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 {{path_docker_compose_files}}akaunting/ + cd {{docker_compose_instances_directory}}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 6a272858..06efb319 100644 --- a/roles/docker-akaunting/vars/main.yml +++ b/roles/docker-akaunting/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{path_docker_compose_files}}akaunting/" +docker_compose_instance_directory: "{{docker_compose_instances_directory}}akaunting/" diff --git a/roles/docker-attendize/vars/main.yml b/roles/docker-attendize/vars/main.yml index 5645bf91..741d1608 100644 --- a/roles/docker-attendize/vars/main.yml +++ b/roles/docker-attendize/vars/main.yml @@ -1,3 +1,3 @@ --- -docker_compose_instance_directory: "{{path_docker_compose_files}}attendize/" +docker_compose_instance_directory: "{{docker_compose_instances_directory}}attendize/" mail_interface_domain: "mail.{{domain}}" diff --git a/roles/docker-baserow/handlers/main.yml b/roles/docker-baserow/handlers/main.yml index 9cad282a..3e37556d 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: "{{path_docker_compose_files}}baserow/" + chdir: "{{docker_compose_instances_directory}}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 fbd997e8..9c98e0d7 100644 --- a/roles/docker-baserow/vars/main.yml +++ b/roles/docker-baserow/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{path_docker_compose_files}}baserow/" \ No newline at end of file +docker_compose_instance_directory: "{{docker_compose_instances_directory}}baserow/" \ No newline at end of file diff --git a/roles/docker-bigbluebutton/vars/main.yml b/roles/docker-bigbluebutton/vars/main.yml index 7b1a7790..edafc84f 100644 --- a/roles/docker-bigbluebutton/vars/main.yml +++ b/roles/docker-bigbluebutton/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{path_docker_compose_files}}bigbluebutton/" \ No newline at end of file +docker_compose_instance_directory: "{{docker_compose_instances_directory}}bigbluebutton/" \ No newline at end of file diff --git a/roles/docker-funkwhale/vars/main.yml b/roles/docker-funkwhale/vars/main.yml index a04726fa..b65f6013 100644 --- a/roles/docker-funkwhale/vars/main.yml +++ b/roles/docker-funkwhale/vars/main.yml @@ -1,2 +1,2 @@ -docker_compose_instance_directory: "{{path_docker_compose_files}}funkwhale/" +docker_compose_instance_directory: "{{docker_compose_instances_directory}}funkwhale/" client_max_body_size: "512M" diff --git a/roles/docker-gitea/vars/main.yml b/roles/docker-gitea/vars/main.yml index bf380fda..1e663c61 100644 --- a/roles/docker-gitea/vars/main.yml +++ b/roles/docker-gitea/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{path_docker_compose_files}}gitea/" +docker_compose_instance_directory: "{{docker_compose_instances_directory}}gitea/" diff --git a/roles/docker-joomla/vars/main.yml b/roles/docker-joomla/vars/main.yml index 5abb2051..30a906ea 100644 --- a/roles/docker-joomla/vars/main.yml +++ b/roles/docker-joomla/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{path_docker_compose_files}}joomla/" +docker_compose_instance_directory: "{{docker_compose_instances_directory}}joomla/" diff --git a/roles/docker-listmonk/handlers/main.yml b/roles/docker-listmonk/handlers/main.yml index 95f93475..286bef09 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: "{{path_docker_compose_files}}listmonk/" + chdir: "{{docker_compose_instances_directory}}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 e1eb20aa..ef1a09a8 100644 --- a/roles/docker-listmonk/vars/main.yml +++ b/roles/docker-listmonk/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{path_docker_compose_files}}listmonk/" +docker_compose_instance_directory: "{{docker_compose_instances_directory}}listmonk/" diff --git a/roles/docker-mailu/tasks/main.yml b/roles/docker-mailu/tasks/main.yml index 080ea80c..fe93dd73 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 {{path_docker_compose_files}}mailu" +- name: "create {{docker_compose_instances_directory}}mailu" file: - path: "{{path_docker_compose_files}}mailu" + path: "{{docker_compose_instances_directory}}mailu" state: directory mode: 0755 diff --git a/roles/docker-mailu/vars/main.yml b/roles/docker-mailu/vars/main.yml index 11ff0ae1..85d5c496 100644 --- a/roles/docker-mailu/vars/main.yml +++ b/roles/docker-mailu/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{path_docker_compose_files}}mailu/" \ No newline at end of file +docker_compose_instance_directory: "{{docker_compose_instances_directory}}mailu/" \ No newline at end of file diff --git a/roles/docker-mastodon/README.md b/roles/docker-mastodon/README.md index 3dc6a2c5..d2b4b113 100644 --- a/roles/docker-mastodon/README.md +++ b/roles/docker-mastodon/README.md @@ -5,11 +5,11 @@ ``` ## cleanup ```bash -cd {{path_docker_compose_files}}mastodon/ +cd {{docker_compose_instances_directory}}mastodon/ docker-compose down docker volume rm mastodon_data mastodon_database mastodon_redis -cd {{path_docker_compose_files}} && -rm -vR {{path_docker_compose_files}}mastodon +cd {{docker_compose_instances_directory}} && +rm -vR {{docker_compose_instances_directory}}mastodon ``` ## access terminal diff --git a/roles/docker-mastodon/vars/main.yml b/roles/docker-mastodon/vars/main.yml index 31c78177..d6893ba3 100644 --- a/roles/docker-mastodon/vars/main.yml +++ b/roles/docker-mastodon/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{path_docker_compose_files}}mastodon/" +docker_compose_instance_directory: "{{docker_compose_instances_directory}}mastodon/" diff --git a/roles/docker-matomo/README.md b/roles/docker-matomo/README.md index 6c25ebfb..efac16f7 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. -- `path_docker_compose_files`: Path to store Docker Compose files. +- `docker_compose_instances_directory`: 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 1bf79ec3..6e3581df 100644 --- a/roles/docker-matomo/vars/main.yml +++ b/roles/docker-matomo/vars/main.yml @@ -1,2 +1,2 @@ --- -docker_compose_instance_directory: "{{path_docker_compose_files}}matomo/" \ No newline at end of file +docker_compose_instance_directory: "{{docker_compose_instances_directory}}matomo/" \ No newline at end of file diff --git a/roles/docker-mybb/README.md b/roles/docker-mybb/README.md index c73aa738..8d2f6bdd 100644 --- a/roles/docker-mybb/README.md +++ b/roles/docker-mybb/README.md @@ -5,9 +5,9 @@ ## Variables - `docker_compose_instance_directory`: The directory where Docker Compose files for MyBB are stored. -- `conf_d_docker_directory`: Directory for Docker Nginx configuration. -- `default_conf_server_file`: The default Nginx configuration file for the server. -- `conf_d_server_directory`: The Nginx server's configuration directory. +- `target_mount_conf_d_directory`: Directory for Docker Nginx configuration. +- `default_conf_docker_file`: The default Nginx configuration file for the server. +- `docker_compose_instance_confd_directory`: The Nginx server's configuration directory. ## Tasks 1. **Domain Certificate Retrieval:** Automates the process of obtaining SSL certificates for the specified domain using Certbot. @@ -18,11 +18,53 @@ ## Usage -### Install Plugins -To install MyBB plugins, extract them to a mounted volume and sync using the provided `docker run` command -```bash -docker run --rm -v mybb-data:/target/ -v /mnt/:/origin/ "kevinveenbirkenbach/alpine-rsync" sh -c "rsync -avv /origin/inc/plugins/ /target/" -``` +### Manual Installation of MyBB Plugins + +This guide describes the process of manually installing MyBB plugins in your Docker-MyBB environment. This can be useful if you want to quickly test plugins or do not wish to execute the Ansible role. + +#### Steps for Manual Installation + + +1. **Prepare Plugin Files:** + - Download the desired MyBB plugin zip files. + +2. **Copy plugin to host:** + - ```bash scp administrator@:/home/administrator/docker-compose/mybb/plugins``` + +3. **Unzip Plugin Files on the Host:** + - Unzip the plugin zip files in the host's plugin directory: + ```bash + unzip /home/administrator/docker-compose/mybb/plugins/.zip -d /home/administrator/docker-compose/mybb/plugins/ + ``` + - Replace `.zip` with the name of the plugin zip file. + - Repeat this step for each plugin. + +4. **Access the Docker Container:** + - Open a terminal or SSH session on the server where the Docker container is running. + +5. **Copy Unzipped Plugin Files to the Container:** + - Copy the unzipped plugin files from the host directory to the Docker container: + ```bash + docker compose cp /home/administrator/docker-compose/mybb/plugins/ application:/var/www/html/inc/plugins/ + ``` + - Replace `` with the name of the unzipped plugin folder. + +6. **Restart the Container:** + - Execute the following command to restart the MyBB container: + ```bash + docker-compose -p mybb up -d --force-recreate + ``` + - This ensures all changes take effect. + +7. **Activate Plugins in the MyBB Admin Panel:** + - Open the MyBB admin panel in your web browser. + - Navigate to the plugin settings and activate the newly installed plugins. + +#### Important Notes + +- Ensure you use the correct paths and filenames. +- Do not forget to regularly back up your MyBB database and files before making changes. +- If encountering issues, refer to the MyBB documentation or specific instructions from the plugin author. ### Running the Role Execute the Ansible playbook containing this role to set up MyBB in a Docker environment. diff --git a/roles/docker-mybb/tasks/main.yml b/roles/docker-mybb/tasks/main.yml index 641cdb9a..7b2f348c 100644 --- a/roles/docker-mybb/tasks/main.yml +++ b/roles/docker-mybb/tasks/main.yml @@ -5,17 +5,17 @@ loop_control: loop_var: domain -- name: "create {{conf_d_server_directory}} and parent directories" +- name: "create {{docker_compose_instance_confd_directory}} and parent directories" file: - path: "{{conf_d_server_directory}}" + path: "{{docker_compose_instance_confd_directory}}" state: directory mode: 0755 recurse: yes -- name: "create {{default_conf_server_file}}" +- name: "create {{docker_compose_instance_confd_defaultconf_file}}" template: src: "default.conf" - dest: "{{default_conf_server_file}}" + dest: "{{docker_compose_instance_confd_defaultconf_file}}" notify: recreate mybb - name: add docker-compose.yml diff --git a/roles/docker-mybb/templates/default.conf b/roles/docker-mybb/templates/default.conf index 170581e3..f4b7b1e8 100644 --- a/roles/docker-mybb/templates/default.conf +++ b/roles/docker-mybb/templates/default.conf @@ -7,7 +7,6 @@ server { error_log stderr debug; root /var/www/html; index index.html index.php; - worker_processes auto; location / { try_files $uri $uri/ /index.php?$args; @@ -30,13 +29,6 @@ server { fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param PATH_INFO $fastcgi_path_info; - # client timeout - keepalive_timeout 60s; - client_header_timeout 60s; - client_body_timeout 60s; - send_timeout 300s; - reset_timedout_connection on; - # proxy timeouts proxy_connect_timeout 300s; proxy_send_timeout 300s; diff --git a/roles/docker-mybb/templates/docker-compose.yml.j2 b/roles/docker-mybb/templates/docker-compose.yml.j2 index 68aba48c..40a2317c 100644 --- a/roles/docker-mybb/templates/docker-compose.yml.j2 +++ b/roles/docker-mybb/templates/docker-compose.yml.j2 @@ -23,7 +23,7 @@ services: ports: - "127.0.0.1:{{http_port}}:80" volumes: - - "{{conf_d_server_directory}}:{{conf_d_docker_directory}}:ro" + - "{{docker_compose_instance_confd_directory}}:{{target_mount_conf_d_directory}}:ro" - "data:/var/www/html:ro" database: logging: @@ -36,7 +36,7 @@ services: POSTGRES_USER: mybb image: postgres:14-alpine volumes: - - ${PWD}/postgres/data:/var/lib/postgresql/data:rw + - database:/var/lib/postgresql/data:rw restart: always volumes: database: diff --git a/roles/docker-mybb/vars/main.yml b/roles/docker-mybb/vars/main.yml index 36c875b8..0a54dd9e 100644 --- a/roles/docker-mybb/vars/main.yml +++ b/roles/docker-mybb/vars/main.yml @@ -1,5 +1,5 @@ --- -docker_compose_instance_directory: "{{path_docker_compose_files}}mybb/" -conf_d_server_directory: "{{docker_compose_instance_directory}}conf.d/" -default_conf_server_file: "{{conf_d_docker_directory}}default.conf" -conf_d_docker_directory: "/etc/nginx/conf.d/" \ No newline at end of file +docker_compose_instance_directory: "{{docker_compose_instances_directory}}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 27090552..e2fa527c 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 {{path_docker_compose_files}}nextcloud && +cd {{docker_compose_instances_directory}}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 603e4458..d0779010 100644 --- a/roles/docker-nextcloud/vars/main.yml +++ b/roles/docker-nextcloud/vars/main.yml @@ -1,2 +1,2 @@ --- -docker_compose_instance_directory: "{{path_docker_compose_files}}nextcloud/" \ No newline at end of file +docker_compose_instance_directory: "{{docker_compose_instances_directory}}nextcloud/" \ No newline at end of file diff --git a/roles/docker-peertube/README.md b/roles/docker-peertube/README.md index 9daf673d..784925ed 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 {{path_docker_compose_files}}peertube/ && +cd {{docker_compose_instances_directory}}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 5c652012..672fbf42 100644 --- a/roles/docker-peertube/vars/main.yml +++ b/roles/docker-peertube/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{path_docker_compose_files}}peertube/" +docker_compose_instance_directory: "{{docker_compose_instances_directory}}peertube/" diff --git a/roles/docker-pixelfed/README.md b/roles/docker-pixelfed/README.md index d4b304ef..cd1bd31e 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 {{path_docker_compose_files}}pixelfed/ && +cd {{docker_compose_instances_directory}}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 7d828b11..734fbd45 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: "{{path_docker_compose_files}}pixelfed/" + chdir: "{{docker_compose_instances_directory}}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 64128963..8401f979 100644 --- a/roles/docker-pixelfed/vars/main.yml +++ b/roles/docker-pixelfed/vars/main.yml @@ -1,2 +1,2 @@ -docker_compose_instance_directory: "{{path_docker_compose_files}}pixelfed/" +docker_compose_instance_directory: "{{docker_compose_instances_directory}}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 ab0e3aac..8db7cdee 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: "{{path_docker_compose_files}}roulette-wheel/" -app_path: "{{path_docker_compose_files}}roulette-wheel/app/" \ No newline at end of file +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 diff --git a/roles/docker-wordpress/vars/main.yml b/roles/docker-wordpress/vars/main.yml index 21e4e324..50b25d30 100644 --- a/roles/docker-wordpress/vars/main.yml +++ b/roles/docker-wordpress/vars/main.yml @@ -1,2 +1,2 @@ -docker_compose_instance_directory: "{{path_docker_compose_files}}wordpress/" +docker_compose_instance_directory: "{{docker_compose_instances_directory}}wordpress/" wordpress_max_upload_size: "64M" diff --git a/roles/docker-yourls/vars/main.yml b/roles/docker-yourls/vars/main.yml index dbaf8c01..f8d09cad 100644 --- a/roles/docker-yourls/vars/main.yml +++ b/roles/docker-yourls/vars/main.yml @@ -1 +1 @@ -docker_compose_instance_directory: "{{path_docker_compose_files}}yourls/" \ No newline at end of file +docker_compose_instance_directory: "{{docker_compose_instances_directory}}yourls/" \ No newline at end of file diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index f5936a39..0ab1c2bb 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -6,9 +6,9 @@ state: present notify: docker restart -- name: "create {{path_docker_compose_files}}" +- name: "create {{docker_compose_instances_directory}}" file: - path: "{{path_docker_compose_files}}" + path: "{{docker_compose_instances_directory}}" 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 3e438cc0..4c1d19d5 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}} {{path_docker_compose_files}}' \ No newline at end of file +ExecStart=/bin/sh -c '/usr/bin/python {{update_docker_script}} {{docker_compose_instances_directory}}' \ No newline at end of file diff --git a/roles/update/tasks/main.yml b/roles/update/tasks/main.yml index 8b12836b..7c414087 100644 --- a/roles/update/tasks/main.yml +++ b/roles/update/tasks/main.yml @@ -1,7 +1,7 @@ --- -- name: "Check if {{ path_docker_compose_files }} directory exists" +- name: "Check if {{ docker_compose_instances_directory }} directory exists" stat: - path: "{{ path_docker_compose_files }}" + path: "{{ docker_compose_instances_directory }}" register: docker_compose_directory_stat - name: "Update with pacman"