diff --git a/galaxy.yml b/galaxy.yml index 0a246aa..f52d7ac 100644 --- a/galaxy.yml +++ b/galaxy.yml @@ -15,7 +15,6 @@ dependencies: ansible.posix: "*" community.crypto: "*" community.general: "*" - containers.podman: "*" freeipa.ansible_freeipa: "1.15.1" tags: - linux diff --git a/roles/baseline/handlers/main.yml b/roles/baseline/handlers/main.yml index fa34d18..032d30f 100644 --- a/roles/baseline/handlers/main.yml +++ b/roles/baseline/handlers/main.yml @@ -16,9 +16,3 @@ name: firewalld state: reloaded become: true - -- name: Reload rsyslog - ansible.builtin.systemd_service: - name: rsyslog - state: reloaded - become: true diff --git a/roles/podman_host/tasks/main.yml b/roles/podman_host/tasks/main.yml index 45ab3e4..24d9e2e 100644 --- a/roles/podman_host/tasks/main.yml +++ b/roles/podman_host/tasks/main.yml @@ -14,15 +14,6 @@ state: latest become: true -- name: Podman Host | PATCH | Install containers.conf - ansible.builtin.template: - src: etc/containers.conf - dest: /etc/containers.conf - owner: root - group: root - mode: "0644" - become: true - - name: Podman Host | AUDIT | Ensure that users exist and have subids configured ansible.builtin.include_tasks: file: check_users.yml diff --git a/roles/podman_host/templates/etc/containters.conf b/roles/podman_host/templates/etc/containters.conf deleted file mode 100644 index af985a1..0000000 --- a/roles/podman_host/templates/etc/containters.conf +++ /dev/null @@ -1,2 +0,0 @@ -[engine] -env = ["TMPDIR=/tmp"] \ No newline at end of file diff --git a/roles/podman_host/templates/subXid.j2 b/roles/podman_host/templates/subXid.j2 new file mode 100644 index 0000000..a8022c6 --- /dev/null +++ b/roles/podman_host/templates/subXid.j2 @@ -0,0 +1,4 @@ +# {{ ansible_managed }} +{% for username in podman_host_rootless_users %} +{{ username }}:{{ 100000 + ((loop.index - 1) * 65536) }}:65536 +{% endfor %}