From d729f860c306c39787f307f06456696e7117e020 Mon Sep 17 00:00:00 2001 From: Mike Holloway Date: Sat, 6 Dec 2025 16:53:54 -0500 Subject: [PATCH] Removed item var from conf j2 template file --- tasks/files.yml | 13 ++++++------- {files => templates}/docker-compose.yml.j2 | 4 ++-- templates/test | 0 3 files changed, 8 insertions(+), 9 deletions(-) rename {files => templates}/docker-compose.yml.j2 (96%) delete mode 100644 templates/test diff --git a/tasks/files.yml b/tasks/files.yml index 4eaba12..c561f3f 100644 --- a/tasks/files.yml +++ b/tasks/files.yml @@ -19,13 +19,6 @@ owner: "100999" group: "100999" -- name: Create Compose File - copy: - src: "docker-compose.yml.j2" - dest: "/home/{{ user.name }}/docker-compose.yml" - owner: "{{ user.name }}" - group: "{{ user.name }}" - - name: Cointainer Path nginx.conf directory file: path: "/home/{{ user.name }}/web" @@ -40,4 +33,10 @@ owner: "{{ user.name }}" group: "{{ user.name }}" +- name: Create Compose File + template: + src: "docker-compose.yml.j2" + dest: "/home/{{ user.name }}/docker-compose.yml" + owner: "{{ user.name }}" + group: "{{ user.name }}" diff --git a/files/docker-compose.yml.j2 b/templates/docker-compose.yml.j2 similarity index 96% rename from files/docker-compose.yml.j2 rename to templates/docker-compose.yml.j2 index d523f7e..5f0ff05 100644 --- a/files/docker-compose.yml.j2 +++ b/templates/docker-compose.yml.j2 @@ -78,7 +78,7 @@ services: - certs:/etc/nginx/certs:z,ro - vhost.d:/etc/nginx/vhost.d:z - html:/usr/share/nginx/html:z - - /run/user/{{ getent_passwd[item.name][2] }}/podman/podman.sock:/tmp/docker.sock:ro + - /run/user/{{ getent_passwd[user.name][2] }}/podman/podman.sock:/tmp/docker.sock:ro networks: - proxy-tier @@ -92,7 +92,7 @@ services: - acme:/etc/acme.sh:z - vhost.d:/etc/nginx/vhost.d:z - html:/usr/share/nginx/html:z - - /run/user/{{ getent_passwd[item.name][2] }}/podman/podman.sock:/tmp/docker.sock:ro + - /run/user/{{ getent_passwd[user.name][2] }}/podman/podman.sock:/tmp/docker.sock:ro environment: - DEFAULT_EMAIL="admin@libre.audio" networks: diff --git a/templates/test b/templates/test deleted file mode 100644 index e69de29..0000000