diff --git a/ansible/roles/podman/tasks/configuration-nginx-http.yml b/ansible/roles/podman/tasks/configuration-nginx-http.yml index 1a50adc..157ac26 100644 --- a/ansible/roles/podman/tasks/configuration-nginx-http.yml +++ b/ansible/roles/podman/tasks/configuration-nginx-http.yml @@ -62,7 +62,7 @@ mode: 0644 loop: - "{{ ci_server_name }}.http.conf" - #- "{{ pi_server_name }}.conf" + # - "{{ pi_server_name }}.conf" - "{{ home_server_name }}.conf" - "{{ assistant_server_name }}.conf" - "{{ video_server_name }}.conf" @@ -83,7 +83,7 @@ state: link loop: - "{{ ci_server_name }}.http.conf" - #- "{{ pi_server_name }}.conf" + # - "{{ pi_server_name }}.conf" - "{{ parts_server_name }}.conf" - "{{ home_server_name }}.conf" - "{{ assistant_server_name }}.conf" diff --git a/ansible/roles/podman/tasks/configuration-nginx.yml b/ansible/roles/podman/tasks/configuration-nginx.yml index 354b98b..e7940b9 100644 --- a/ansible/roles/podman/tasks/configuration-nginx.yml +++ b/ansible/roles/podman/tasks/configuration-nginx.yml @@ -15,7 +15,8 @@ - import_tasks: configuration-nginx-https.yml - import_tasks: configuration-nginx-modsec.yml -- meta: flush_handlers +- name: flush handlers + ansible.builtin.meta: flush_handlers tags: - http - modsec diff --git a/ansible/roles/podman/tasks/container-drone.yml b/ansible/roles/podman/tasks/container-drone.yml index 07a206a..f720d38 100644 --- a/ansible/roles/podman/tasks/container-drone.yml +++ b/ansible/roles/podman/tasks/container-drone.yml @@ -12,7 +12,8 @@ - "{{ drone_path }}/data" tags: drone -- meta: flush_handlers +- name: flush handlers + ansible.builtin.meta: flush_handlers tags: drone - name: create drone-ci server container diff --git a/ansible/roles/podman/tasks/container-graylog.yml b/ansible/roles/podman/tasks/container-graylog.yml index fc3fb16..ce61dd1 100644 --- a/ansible/roles/podman/tasks/container-graylog.yml +++ b/ansible/roles/podman/tasks/container-graylog.yml @@ -34,11 +34,13 @@ - name: unshare chown the elastic volume become: true become_user: "{{ podman_user }}" + changed_when: false ansible.builtin.command: | podman unshare chown -R 1000:1000 {{ graylog_path }}/elastic tags: graylog -- meta: flush_handlers +- name: flush handlers + ansible.builtin.meta: flush_handlers tags: graylog - name: create graylog mongodb container @@ -103,7 +105,6 @@ net.ipv6.conf.default.disable_ipv6: 1 network: - shared - - host volumes: - "{{ graylog_path }}/conf:/usr/share/graylog/data/config" - "{{ graylog_path }}/bin:/usr/share/graylog/bin" diff --git a/ansible/roles/podman/tasks/container-hass.yml b/ansible/roles/podman/tasks/container-hass.yml index 8ac5072..7f35eee 100644 --- a/ansible/roles/podman/tasks/container-hass.yml +++ b/ansible/roles/podman/tasks/container-hass.yml @@ -27,7 +27,8 @@ - automations.yaml tags: hass -- meta: flush_handlers +- name: flush handlers + ansible.builtin.meta: flush_handlers tags: hass - name: create home-assistant server container diff --git a/ansible/roles/podman/tasks/container-partkeepr.yml b/ansible/roles/podman/tasks/container-partkeepr.yml index 0d78f88..ac92349 100644 --- a/ansible/roles/podman/tasks/container-partkeepr.yml +++ b/ansible/roles/podman/tasks/container-partkeepr.yml @@ -12,7 +12,8 @@ - "{{ partkeepr_path }}/mysql" tags: partkeepr -- meta: flush_handlers +- name: flush handlers + ansible.builtin.meta: flush_handlers tags: partkeepr - name: create partkeepr-db container diff --git a/ansible/roles/podman/tasks/podman.yml b/ansible/roles/podman/tasks/podman.yml index 40ba3aa..6d97c72 100644 --- a/ansible/roles/podman/tasks/podman.yml +++ b/ansible/roles/podman/tasks/podman.yml @@ -76,7 +76,8 @@ - "{{ podman_volumes }}" tags: podman -- meta: flush_handlers +- name: flush handlers + ansible.builtin.meta: flush_handlers tags: podman - name: create podman shared network @@ -98,7 +99,8 @@ - name: fetch subuid of {{ podman_user }} become: true + changed_when: false ansible.builtin.shell: | - cat /etc/subuid | awk -F':' '/{{ podman_user }}/{ print $2 }' | head -n 1 + set -o pipefail && cat /etc/subuid | awk -F':' '/{{ podman_user }}/{ print $2 }' | head -n 1 register: podman_subuid tags: always diff --git a/ansible/roles/podman/tasks/systemd-generate.yml b/ansible/roles/podman/tasks/systemd-generate.yml index dd0468b..6562c34 100644 --- a/ansible/roles/podman/tasks/systemd-generate.yml +++ b/ansible/roles/podman/tasks/systemd-generate.yml @@ -2,8 +2,9 @@ - name: create systemd startup job for {{ container_name }} become: true become_user: "{{ podman_user }}" + changed_when: false ansible.builtin.shell: | - podman generate systemd --name {{ container_name }} > {{ podman_home}}/.config/systemd/user/{{ container_name }}.service + podman generate systemd --name {{ container_name }} > {{ podman_home }}/.config/systemd/user/{{ container_name }}.service tags: systemd - name: enable systemd startup job for {{ container_name }}