From 870ac50c581ed2f8e8846a0d43ce2095da821e83 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Sun, 7 Feb 2021 15:59:18 +0000 Subject: [PATCH] Update compose path to not be absolute This relies on `which` to find the correct binary instead --- ansible/roles/deluge/tasks/main.yml | 2 +- ansible/roles/duplicati/tasks/main.yml | 2 +- ansible/roles/gitea/tasks/main.yml | 2 +- ansible/roles/pages/tasks/main.yml | 2 +- ansible/roles/plausible/tasks/main.yml | 2 +- ansible/roles/pve_docker/tasks/calibre.yml | 2 +- ansible/roles/pve_docker/tasks/gotify.yml | 2 +- ansible/roles/pve_docker/tasks/librespeed.yml | 2 +- ansible/roles/pve_docker/tasks/nextcloud.yml | 2 +- ansible/roles/pve_docker/tasks/quassel.yml | 2 +- ansible/roles/pve_docker/tasks/synapse.yml | 2 +- ansible/roles/pve_docker/tasks/tt-rss.yml | 2 +- ansible/roles/pve_docker/tasks/wallabag.yml | 2 +- ansible/roles/pve_docker/tasks/whoami.yml | 2 +- ansible/roles/traefik/tasks/main.yml | 2 +- ansible/roles/upload/tasks/main.yml | 2 +- ansible/roles/yourls/tasks/main.yml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/ansible/roles/deluge/tasks/main.yml b/ansible/roles/deluge/tasks/main.yml index 8b5c4e1..1cbc715 100644 --- a/ansible/roles/deluge/tasks/main.yml +++ b/ansible/roles/deluge/tasks/main.yml @@ -12,6 +12,6 @@ dest: /opt/deluge/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config + validate: docker-compose -f %s config notify: restart deluge become: true diff --git a/ansible/roles/duplicati/tasks/main.yml b/ansible/roles/duplicati/tasks/main.yml index 2353c78..0751b8b 100644 --- a/ansible/roles/duplicati/tasks/main.yml +++ b/ansible/roles/duplicati/tasks/main.yml @@ -12,6 +12,6 @@ dest: /opt/duplicati/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config + validate: docker-compose -f %s config notify: restart duplicati become: true diff --git a/ansible/roles/gitea/tasks/main.yml b/ansible/roles/gitea/tasks/main.yml index 0d90027..cd70d4a 100644 --- a/ansible/roles/gitea/tasks/main.yml +++ b/ansible/roles/gitea/tasks/main.yml @@ -20,6 +20,6 @@ dest: /opt/gitea/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config + validate: docker-compose -f %s config notify: restart gitea become: true diff --git a/ansible/roles/pages/tasks/main.yml b/ansible/roles/pages/tasks/main.yml index 5b600cf..c8986b1 100644 --- a/ansible/roles/pages/tasks/main.yml +++ b/ansible/roles/pages/tasks/main.yml @@ -20,6 +20,6 @@ dest: /opt/pages/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config + validate: docker-compose -f %s config notify: restart pages become: true diff --git a/ansible/roles/plausible/tasks/main.yml b/ansible/roles/plausible/tasks/main.yml index a1046a8..0293245 100644 --- a/ansible/roles/plausible/tasks/main.yml +++ b/ansible/roles/plausible/tasks/main.yml @@ -28,6 +28,6 @@ dest: /opt/plausible/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config + validate: docker-compose -f %s config notify: restart plausible become: true diff --git a/ansible/roles/pve_docker/tasks/calibre.yml b/ansible/roles/pve_docker/tasks/calibre.yml index 4c5b1ad..ce9dbed 100644 --- a/ansible/roles/pve_docker/tasks/calibre.yml +++ b/ansible/roles/pve_docker/tasks/calibre.yml @@ -12,7 +12,7 @@ dest: /opt/calibre/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config + validate: docker-compose -f %s config register: compose_file become: true diff --git a/ansible/roles/pve_docker/tasks/gotify.yml b/ansible/roles/pve_docker/tasks/gotify.yml index fc458c4..921042a 100644 --- a/ansible/roles/pve_docker/tasks/gotify.yml +++ b/ansible/roles/pve_docker/tasks/gotify.yml @@ -12,7 +12,7 @@ dest: /opt/gotify/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config + validate: docker-compose -f %s config register: compose_file become: true diff --git a/ansible/roles/pve_docker/tasks/librespeed.yml b/ansible/roles/pve_docker/tasks/librespeed.yml index cafdf60..6886f2c 100644 --- a/ansible/roles/pve_docker/tasks/librespeed.yml +++ b/ansible/roles/pve_docker/tasks/librespeed.yml @@ -15,7 +15,7 @@ dest: /opt/librespeed/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config + validate: docker-compose -f %s config register: compose_file become: true diff --git a/ansible/roles/pve_docker/tasks/nextcloud.yml b/ansible/roles/pve_docker/tasks/nextcloud.yml index 6511dfa..e3fb593 100644 --- a/ansible/roles/pve_docker/tasks/nextcloud.yml +++ b/ansible/roles/pve_docker/tasks/nextcloud.yml @@ -15,7 +15,7 @@ dest: /opt/nextcloud/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config + validate: docker-compose -f %s config register: compose_file become: true diff --git a/ansible/roles/pve_docker/tasks/quassel.yml b/ansible/roles/pve_docker/tasks/quassel.yml index acd90a9..3f60d57 100644 --- a/ansible/roles/pve_docker/tasks/quassel.yml +++ b/ansible/roles/pve_docker/tasks/quassel.yml @@ -12,7 +12,7 @@ dest: /opt/quassel/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config + validate: docker-compose -f %s config register: compose_file become: true diff --git a/ansible/roles/pve_docker/tasks/synapse.yml b/ansible/roles/pve_docker/tasks/synapse.yml index f39b89c..5efa1de 100644 --- a/ansible/roles/pve_docker/tasks/synapse.yml +++ b/ansible/roles/pve_docker/tasks/synapse.yml @@ -15,7 +15,7 @@ dest: /opt/synapse/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config + validate: docker-compose -f %s config register: compose_file become: true diff --git a/ansible/roles/pve_docker/tasks/tt-rss.yml b/ansible/roles/pve_docker/tasks/tt-rss.yml index 4081cd8..205fc15 100644 --- a/ansible/roles/pve_docker/tasks/tt-rss.yml +++ b/ansible/roles/pve_docker/tasks/tt-rss.yml @@ -21,7 +21,7 @@ dest: /opt/tt-rss/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config + validate: docker-compose -f %s config register: compose_file become: true diff --git a/ansible/roles/pve_docker/tasks/wallabag.yml b/ansible/roles/pve_docker/tasks/wallabag.yml index f46f0fe..7d99aa3 100644 --- a/ansible/roles/pve_docker/tasks/wallabag.yml +++ b/ansible/roles/pve_docker/tasks/wallabag.yml @@ -15,7 +15,7 @@ dest: /opt/wallabag/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config + validate: docker-compose -f %s config register: compose_file become: true diff --git a/ansible/roles/pve_docker/tasks/whoami.yml b/ansible/roles/pve_docker/tasks/whoami.yml index 5d3831f..e8d5d6a 100644 --- a/ansible/roles/pve_docker/tasks/whoami.yml +++ b/ansible/roles/pve_docker/tasks/whoami.yml @@ -12,7 +12,7 @@ dest: /opt/whoami/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config + validate: docker-compose -f %s config register: compose_file become: true diff --git a/ansible/roles/traefik/tasks/main.yml b/ansible/roles/traefik/tasks/main.yml index ef7936d..b22ab76 100644 --- a/ansible/roles/traefik/tasks/main.yml +++ b/ansible/roles/traefik/tasks/main.yml @@ -26,7 +26,7 @@ dest: /opt/traefik/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config + validate: docker-compose -f %s config notify: restart traefik become: true diff --git a/ansible/roles/upload/tasks/main.yml b/ansible/roles/upload/tasks/main.yml index d09b521..ac632e1 100644 --- a/ansible/roles/upload/tasks/main.yml +++ b/ansible/roles/upload/tasks/main.yml @@ -15,6 +15,6 @@ dest: /opt/upload/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config + validate: docker-compose -f %s config notify: restart upload become: true diff --git a/ansible/roles/yourls/tasks/main.yml b/ansible/roles/yourls/tasks/main.yml index 3c945d3..950db42 100644 --- a/ansible/roles/yourls/tasks/main.yml +++ b/ansible/roles/yourls/tasks/main.yml @@ -12,7 +12,7 @@ dest: /opt/yourls/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}" - validate: /usr/bin/docker-compose -f %s config + validate: docker-compose -f %s config notify: restart yourls become: true