diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml index f2dec33..5872d0c 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/ansible/roles/docker/tasks/main.yml @@ -5,10 +5,16 @@ ansible.builtin.apt: name: - docker.io - - docker-compose + - docker-compose-plugin state: present when: ansible_facts["os_family"] == "Debian" +- name: Remove conflicting docker-compose package (Debian) + ansible.builtin.apt: + name: docker-compose + state: absent + when: ansible_facts["os_family"] == "Debian" + - name: Install Docker (Alpine) community.general.apk: name: diff --git a/ansible/roles/firewall_alpine/handlers/main.yml b/ansible/roles/firewall_alpine/handlers/main.yml index 9cb6b17..dc11922 100644 --- a/ansible/roles/firewall_alpine/handlers/main.yml +++ b/ansible/roles/firewall_alpine/handlers/main.yml @@ -1,6 +1,6 @@ --- - name: Restore iptables - ansible.builtin.command: iptables-restore < /etc/iptables/rules-save + ansible.builtin.shell: iptables-restore < /etc/iptables/rules-save changed_when: true - name: Restart fail2ban