diff --git a/.ansible-lint b/.ansible-lint index f68da38..6b5f8aa 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -4,3 +4,4 @@ skip_list: exclude_paths: - .forgejo/ + - "**/*.sops.yaml" diff --git a/inventories/z9/host_vars/yate.yaml b/inventories/z9/host_vars/yate.yaml index b73cfa6..d2dc518 100644 --- a/inventories/z9/host_vars/yate.yaml +++ b/inventories/z9/host_vars/yate.yaml @@ -6,4 +6,4 @@ docker_compose__configuration_files: content: "{{ lookup('ansible.builtin.template', 'resources/z9/yate/docker_compose/regexroute.conf.j2') }}" - name: regfile.conf content: "{{ lookup('ansible.builtin.template', 'resources/z9/yate/docker_compose/regfile.conf.j2') }}" -docker_compose__restart_cmd: "exec yate sh -c 'kill -1 1'" \ No newline at end of file +docker_compose__restart_cmd: "exec yate sh -c 'kill -1 1'" diff --git a/roles/deploy_ssh_server_config/tasks/main.yaml b/roles/deploy_ssh_server_config/tasks/main.yaml index 4350790..dbbf76e 100644 --- a/roles/deploy_ssh_server_config/tasks/main.yaml +++ b/roles/deploy_ssh_server_config/tasks/main.yaml @@ -27,8 +27,8 @@ mv /etc/ssh/moduli.tmp /etc/ssh/moduli echo "ansible-changed: changed /etc/ssh/moduli" fi - register: result + register: deploy_ssh_server_config__result changed_when: - - '"ansible-changed" in result.stdout' + - '"ansible-changed" in deploy_ssh_server_config__result.stdout' notify: - restart the ssh service diff --git a/roles/docker_compose/defaults/main.yaml b/roles/docker_compose/defaults/main.yaml index 7c083ba..1312972 100644 --- a/roles/docker_compose/defaults/main.yaml +++ b/roles/docker_compose/defaults/main.yaml @@ -1,2 +1,2 @@ docker_compose__configuration_files: [ ] -docker_compose__restart_cmd: "" \ No newline at end of file +docker_compose__restart_cmd: "" diff --git a/roles/docker_compose/handlers/main.yaml b/roles/docker_compose/handlers/main.yaml index f974335..49e064c 100644 --- a/roles/docker_compose/handlers/main.yaml +++ b/roles/docker_compose/handlers/main.yaml @@ -9,4 +9,5 @@ cmd: /usr/bin/docker compose {{ docker_compose__restart_cmd }} chdir: /ansible_docker_compose become: true + changed_when: true # Mark this as always changed (for now?). when: docker_compose__restart_cmd != ""