From 1e76fc100cdeac86f9e08cf92f89709b0dbf7215 Mon Sep 17 00:00:00 2001 From: Wojciech Kozlowski Date: Sat, 8 Jul 2023 10:04:37 +0200 Subject: [PATCH] Drop the jinja file extension --- playbooks/roles/backups/restic/user/tasks/main.yml | 6 +++--- .../{restic-aws-keys.yml.j2 => restic-aws-keys.yml} | 0 .../user/templates/{restic.password.j2 => restic.password} | 0 .../restic/user/templates/{volumes.yml.j2 => volumes.yml} | 0 playbooks/roles/backups/snapshots/user/tasks/main.yml | 2 +- .../user/templates/{volumes.yml.j2 => volumes.yml} | 0 playbooks/roles/services/deploy/cloud/tasks/main.yml | 4 ++-- .../nextcloud/{admin.password.j2 => admin.password} | 0 .../cloud/templates/nextcloud/{admin.user.j2 => admin.user} | 0 .../templates/nextcloud/{database.name.j2 => database.name} | 0 .../nextcloud/{database.password.j2 => database.password} | 0 .../templates/nextcloud/{database.user.j2 => database.user} | 0 ...cloud-chown.service.j2 => container-cloud-chown.service} | 0 ...r-cloud-cron.service.j2 => container-cloud-cron.service} | 0 ...xtcloud.service.j2 => container-cloud-nextcloud.service} | 0 ...cloud-nginx.service.j2 => container-cloud-nginx.service} | 0 .../systemd/{pod-cloud.service.j2 => pod-cloud.service} | 0 playbooks/roles/services/deploy/database/tasks/main.yml | 4 ++-- .../postgres/{database.password.j2 => database.password} | 0 ...tgres.service.j2 => container-database-postgres.service} | 0 .../{pod-database.service.j2 => pod-database.service} | 0 playbooks/roles/services/deploy/git/tasks/main.yml | 2 +- ...ner-git-gitea.service.j2 => container-git-gitea.service} | 0 .../systemd/{pod-git.service.j2 => pod-git.service} | 0 playbooks/roles/services/deploy/lrproxy/tasks/main.yml | 4 ++-- ...oxy-nginx.service.j2 => container-lrproxy-nginx.service} | 0 .../systemd/{pod-lrproxy.service.j2 => pod-lrproxy.service} | 0 ...c-certificates.service.j2 => rsync-certificates.service} | 0 ...rsync-certificates.timer.j2 => rsync-certificates.timer} | 0 playbooks/roles/services/deploy/music/tasks/main.yml | 2 +- ...c-archive.service.j2 => container-music-archive.service} | 0 ...ection.service.j2 => container-music-collection.service} | 0 .../systemd/{pod-music.service.j2 => pod-music.service} | 0 playbooks/roles/services/deploy/notes/tasks/main.yml | 2 +- ...notes-chown.service.j2 => container-notes-chown.service} | 0 ...tes-joplin.service.j2 => container-notes-joplin.service} | 0 .../systemd/{pod-notes.service.j2 => pod-notes.service} | 0 playbooks/roles/services/deploy/rproxy/tasks/main.yml | 2 +- ...-certbot.service.j2 => container-rproxy-certbot.service} | 0 ...roxy-certbot.timer.j2 => container-rproxy-certbot.timer} | 0 ...roxy-nginx.service.j2 => container-rproxy-nginx.service} | 0 .../systemd/{pod-rproxy.service.j2 => pod-rproxy.service} | 0 playbooks/roles/services/deploy/www/tasks/main.yml | 4 ++-- .../services/deploy/www/templates/hugo/{apt.j2 => apt} | 0 ...ner-www-nginx.service.j2 => container-www-nginx.service} | 0 .../systemd/{pod-www.service.j2 => pod-www.service} | 0 .../roles/services/setup/system/tasks/include/veth.yml | 2 +- ...nnect-pod-service@.path.j2 => connect-pod-service@.path} | 0 .../roles/services/setup/user/tasks/include/podman.yml | 2 +- playbooks/roles/services/setup/user/tasks/include/veth.yml | 2 +- .../user/templates/podman/{storage.conf.j2 => storage.conf} | 0 .../setup/user/templates/veth/{interface.j2 => interface} | 0 playbooks/roles/system/zfs/tasks/include/scrub.yml | 2 +- ...stemd-mail-zpool-status.j2 => systemd-mail-zpool-status} | 0 roles | 2 +- 55 files changed, 21 insertions(+), 21 deletions(-) rename playbooks/roles/backups/restic/user/templates/{restic-aws-keys.yml.j2 => restic-aws-keys.yml} (100%) rename playbooks/roles/backups/restic/user/templates/{restic.password.j2 => restic.password} (100%) rename playbooks/roles/backups/restic/user/templates/{volumes.yml.j2 => volumes.yml} (100%) rename playbooks/roles/backups/snapshots/user/templates/{volumes.yml.j2 => volumes.yml} (100%) rename playbooks/roles/services/deploy/cloud/templates/nextcloud/{admin.password.j2 => admin.password} (100%) rename playbooks/roles/services/deploy/cloud/templates/nextcloud/{admin.user.j2 => admin.user} (100%) rename playbooks/roles/services/deploy/cloud/templates/nextcloud/{database.name.j2 => database.name} (100%) rename playbooks/roles/services/deploy/cloud/templates/nextcloud/{database.password.j2 => database.password} (100%) rename playbooks/roles/services/deploy/cloud/templates/nextcloud/{database.user.j2 => database.user} (100%) rename playbooks/roles/services/deploy/cloud/templates/systemd/{container-cloud-chown.service.j2 => container-cloud-chown.service} (100%) rename playbooks/roles/services/deploy/cloud/templates/systemd/{container-cloud-cron.service.j2 => container-cloud-cron.service} (100%) rename playbooks/roles/services/deploy/cloud/templates/systemd/{container-cloud-nextcloud.service.j2 => container-cloud-nextcloud.service} (100%) rename playbooks/roles/services/deploy/cloud/templates/systemd/{container-cloud-nginx.service.j2 => container-cloud-nginx.service} (100%) rename playbooks/roles/services/deploy/cloud/templates/systemd/{pod-cloud.service.j2 => pod-cloud.service} (100%) rename playbooks/roles/services/deploy/database/templates/postgres/{database.password.j2 => database.password} (100%) rename playbooks/roles/services/deploy/database/templates/systemd/{container-database-postgres.service.j2 => container-database-postgres.service} (100%) rename playbooks/roles/services/deploy/database/templates/systemd/{pod-database.service.j2 => pod-database.service} (100%) rename playbooks/roles/services/deploy/git/templates/systemd/{container-git-gitea.service.j2 => container-git-gitea.service} (100%) rename playbooks/roles/services/deploy/git/templates/systemd/{pod-git.service.j2 => pod-git.service} (100%) rename playbooks/roles/services/deploy/lrproxy/templates/systemd/{container-lrproxy-nginx.service.j2 => container-lrproxy-nginx.service} (100%) rename playbooks/roles/services/deploy/lrproxy/templates/systemd/{pod-lrproxy.service.j2 => pod-lrproxy.service} (100%) rename playbooks/roles/services/deploy/lrproxy/templates/systemd/{rsync-certificates.service.j2 => rsync-certificates.service} (100%) rename playbooks/roles/services/deploy/lrproxy/templates/systemd/{rsync-certificates.timer.j2 => rsync-certificates.timer} (100%) rename playbooks/roles/services/deploy/music/templates/systemd/{container-music-archive.service.j2 => container-music-archive.service} (100%) rename playbooks/roles/services/deploy/music/templates/systemd/{container-music-collection.service.j2 => container-music-collection.service} (100%) rename playbooks/roles/services/deploy/music/templates/systemd/{pod-music.service.j2 => pod-music.service} (100%) rename playbooks/roles/services/deploy/notes/templates/systemd/{container-notes-chown.service.j2 => container-notes-chown.service} (100%) rename playbooks/roles/services/deploy/notes/templates/systemd/{container-notes-joplin.service.j2 => container-notes-joplin.service} (100%) rename playbooks/roles/services/deploy/notes/templates/systemd/{pod-notes.service.j2 => pod-notes.service} (100%) rename playbooks/roles/services/deploy/rproxy/templates/systemd/{container-rproxy-certbot.service.j2 => container-rproxy-certbot.service} (100%) rename playbooks/roles/services/deploy/rproxy/templates/systemd/{container-rproxy-certbot.timer.j2 => container-rproxy-certbot.timer} (100%) rename playbooks/roles/services/deploy/rproxy/templates/systemd/{container-rproxy-nginx.service.j2 => container-rproxy-nginx.service} (100%) rename playbooks/roles/services/deploy/rproxy/templates/systemd/{pod-rproxy.service.j2 => pod-rproxy.service} (100%) rename playbooks/roles/services/deploy/www/templates/hugo/{apt.j2 => apt} (100%) rename playbooks/roles/services/deploy/www/templates/systemd/{container-www-nginx.service.j2 => container-www-nginx.service} (100%) rename playbooks/roles/services/deploy/www/templates/systemd/{pod-www.service.j2 => pod-www.service} (100%) rename playbooks/roles/services/setup/system/templates/veth/{connect-pod-service@.path.j2 => connect-pod-service@.path} (100%) rename playbooks/roles/services/setup/user/templates/podman/{storage.conf.j2 => storage.conf} (100%) rename playbooks/roles/services/setup/user/templates/veth/{interface.j2 => interface} (100%) rename playbooks/roles/system/zfs/templates/scrub/{systemd-mail-zpool-status.j2 => systemd-mail-zpool-status} (100%) diff --git a/playbooks/roles/backups/restic/user/tasks/main.yml b/playbooks/roles/backups/restic/user/tasks/main.yml index 18af5c4..95fe16c 100644 --- a/playbooks/roles/backups/restic/user/tasks/main.yml +++ b/playbooks/roles/backups/restic/user/tasks/main.yml @@ -1,18 +1,18 @@ --- - name: "{{ backups_restic_user_name }} : create restic password file" ansible.builtin.template: - src: "./restic.password.j2" + src: "./restic.password" dest: "{{ backups_restic_user_restic_password_file }}" mode: 0600 - name: "{{ backups_restic_user_name }} : create aws key file" ansible.builtin.template: - src: "./restic-aws-keys.yml.j2" + src: "./restic-aws-keys.yml" dest: "{{ backups_restic_user_aws_keys_file }}" mode: 0600 - name: "{{ backups_restic_user_name }} : configure service restic backups" ansible.builtin.template: - src: "./volumes.yml.j2" + src: "./volumes.yml" dest: "/etc/restic-batch.d/{{ backups_restic_user_name }}.yml" mode: 0644 diff --git a/playbooks/roles/backups/restic/user/templates/restic-aws-keys.yml.j2 b/playbooks/roles/backups/restic/user/templates/restic-aws-keys.yml similarity index 100% rename from playbooks/roles/backups/restic/user/templates/restic-aws-keys.yml.j2 rename to playbooks/roles/backups/restic/user/templates/restic-aws-keys.yml diff --git a/playbooks/roles/backups/restic/user/templates/restic.password.j2 b/playbooks/roles/backups/restic/user/templates/restic.password similarity index 100% rename from playbooks/roles/backups/restic/user/templates/restic.password.j2 rename to playbooks/roles/backups/restic/user/templates/restic.password diff --git a/playbooks/roles/backups/restic/user/templates/volumes.yml.j2 b/playbooks/roles/backups/restic/user/templates/volumes.yml similarity index 100% rename from playbooks/roles/backups/restic/user/templates/volumes.yml.j2 rename to playbooks/roles/backups/restic/user/templates/volumes.yml diff --git a/playbooks/roles/backups/snapshots/user/tasks/main.yml b/playbooks/roles/backups/snapshots/user/tasks/main.yml index 64eacc0..535f289 100644 --- a/playbooks/roles/backups/snapshots/user/tasks/main.yml +++ b/playbooks/roles/backups/snapshots/user/tasks/main.yml @@ -17,6 +17,6 @@ - name: "{{ backups_snapshots_user_name }} : configure service syncoid snapshots" ansible.builtin.template: - src: "./volumes.yml.j2" + src: "./volumes.yml" dest: "/etc/syncoid-batch.d/{{ backups_snapshots_user_name }}.yml" mode: 0644 diff --git a/playbooks/roles/backups/snapshots/user/templates/volumes.yml.j2 b/playbooks/roles/backups/snapshots/user/templates/volumes.yml similarity index 100% rename from playbooks/roles/backups/snapshots/user/templates/volumes.yml.j2 rename to playbooks/roles/backups/snapshots/user/templates/volumes.yml diff --git a/playbooks/roles/services/deploy/cloud/tasks/main.yml b/playbooks/roles/services/deploy/cloud/tasks/main.yml index 1abb23c..f8c2962 100644 --- a/playbooks/roles/services/deploy/cloud/tasks/main.yml +++ b/playbooks/roles/services/deploy/cloud/tasks/main.yml @@ -20,7 +20,7 @@ - name: "configure nextcloud secrets" ansible.builtin.template: - src: "./nextcloud/{{ item }}.j2" + src: "./nextcloud/{{ item }}" dest: "{{ services_service_user_home }}/.config/{{ services_service_user_name }}/{{ item }}" mode: 0600 loop: @@ -33,7 +33,7 @@ - name: "configure systemd service" ansible.builtin.template: - src: "./systemd/{{ item }}.j2" + src: "./systemd/{{ item }}" dest: "{{ services_service_user_home }}/.config/systemd/user/{{ item }}" mode: 0600 loop: diff --git a/playbooks/roles/services/deploy/cloud/templates/nextcloud/admin.password.j2 b/playbooks/roles/services/deploy/cloud/templates/nextcloud/admin.password similarity index 100% rename from playbooks/roles/services/deploy/cloud/templates/nextcloud/admin.password.j2 rename to playbooks/roles/services/deploy/cloud/templates/nextcloud/admin.password diff --git a/playbooks/roles/services/deploy/cloud/templates/nextcloud/admin.user.j2 b/playbooks/roles/services/deploy/cloud/templates/nextcloud/admin.user similarity index 100% rename from playbooks/roles/services/deploy/cloud/templates/nextcloud/admin.user.j2 rename to playbooks/roles/services/deploy/cloud/templates/nextcloud/admin.user diff --git a/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.name.j2 b/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.name similarity index 100% rename from playbooks/roles/services/deploy/cloud/templates/nextcloud/database.name.j2 rename to playbooks/roles/services/deploy/cloud/templates/nextcloud/database.name diff --git a/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.password.j2 b/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.password similarity index 100% rename from playbooks/roles/services/deploy/cloud/templates/nextcloud/database.password.j2 rename to playbooks/roles/services/deploy/cloud/templates/nextcloud/database.password diff --git a/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.user.j2 b/playbooks/roles/services/deploy/cloud/templates/nextcloud/database.user similarity index 100% rename from playbooks/roles/services/deploy/cloud/templates/nextcloud/database.user.j2 rename to playbooks/roles/services/deploy/cloud/templates/nextcloud/database.user diff --git a/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-chown.service.j2 b/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-chown.service similarity index 100% rename from playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-chown.service.j2 rename to playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-chown.service diff --git a/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-cron.service.j2 b/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-cron.service similarity index 100% rename from playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-cron.service.j2 rename to playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-cron.service diff --git a/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nextcloud.service.j2 b/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nextcloud.service similarity index 100% rename from playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nextcloud.service.j2 rename to playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nextcloud.service diff --git a/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nginx.service.j2 b/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nginx.service similarity index 100% rename from playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nginx.service.j2 rename to playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nginx.service diff --git a/playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud.service.j2 b/playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud.service similarity index 100% rename from playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud.service.j2 rename to playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud.service diff --git a/playbooks/roles/services/deploy/database/tasks/main.yml b/playbooks/roles/services/deploy/database/tasks/main.yml index b9ca587..9ce8bfc 100644 --- a/playbooks/roles/services/deploy/database/tasks/main.yml +++ b/playbooks/roles/services/deploy/database/tasks/main.yml @@ -13,7 +13,7 @@ - name: "configure postgres password" ansible.builtin.template: - src: "./postgres/database.password.j2" + src: "./postgres/database.password" dest: "\ {{ services_service_user_home }}/.config/{{ services_service_user_name }}/\ database.password" @@ -22,7 +22,7 @@ - name: "configure systemd service" ansible.builtin.template: - src: "./systemd/{{ item }}.j2" + src: "./systemd/{{ item }}" dest: "{{ services_service_user_home }}/.config/systemd/user/{{ item }}" mode: 0600 loop: diff --git a/playbooks/roles/services/deploy/database/templates/postgres/database.password.j2 b/playbooks/roles/services/deploy/database/templates/postgres/database.password similarity index 100% rename from playbooks/roles/services/deploy/database/templates/postgres/database.password.j2 rename to playbooks/roles/services/deploy/database/templates/postgres/database.password diff --git a/playbooks/roles/services/deploy/database/templates/systemd/container-database-postgres.service.j2 b/playbooks/roles/services/deploy/database/templates/systemd/container-database-postgres.service similarity index 100% rename from playbooks/roles/services/deploy/database/templates/systemd/container-database-postgres.service.j2 rename to playbooks/roles/services/deploy/database/templates/systemd/container-database-postgres.service diff --git a/playbooks/roles/services/deploy/database/templates/systemd/pod-database.service.j2 b/playbooks/roles/services/deploy/database/templates/systemd/pod-database.service similarity index 100% rename from playbooks/roles/services/deploy/database/templates/systemd/pod-database.service.j2 rename to playbooks/roles/services/deploy/database/templates/systemd/pod-database.service diff --git a/playbooks/roles/services/deploy/git/tasks/main.yml b/playbooks/roles/services/deploy/git/tasks/main.yml index 14d3782..c39144b 100644 --- a/playbooks/roles/services/deploy/git/tasks/main.yml +++ b/playbooks/roles/services/deploy/git/tasks/main.yml @@ -13,7 +13,7 @@ - name: "configure systemd service" ansible.builtin.template: - src: "./systemd/{{ item }}.j2" + src: "./systemd/{{ item }}" dest: "{{ services_service_user_home }}/.config/systemd/user/{{ item }}" mode: 0600 loop: diff --git a/playbooks/roles/services/deploy/git/templates/systemd/container-git-gitea.service.j2 b/playbooks/roles/services/deploy/git/templates/systemd/container-git-gitea.service similarity index 100% rename from playbooks/roles/services/deploy/git/templates/systemd/container-git-gitea.service.j2 rename to playbooks/roles/services/deploy/git/templates/systemd/container-git-gitea.service diff --git a/playbooks/roles/services/deploy/git/templates/systemd/pod-git.service.j2 b/playbooks/roles/services/deploy/git/templates/systemd/pod-git.service similarity index 100% rename from playbooks/roles/services/deploy/git/templates/systemd/pod-git.service.j2 rename to playbooks/roles/services/deploy/git/templates/systemd/pod-git.service diff --git a/playbooks/roles/services/deploy/lrproxy/tasks/main.yml b/playbooks/roles/services/deploy/lrproxy/tasks/main.yml index 2f685b3..aa57186 100644 --- a/playbooks/roles/services/deploy/lrproxy/tasks/main.yml +++ b/playbooks/roles/services/deploy/lrproxy/tasks/main.yml @@ -32,7 +32,7 @@ - name: "configure systemd service" ansible.builtin.template: - src: "./systemd/{{ item }}.j2" + src: "./systemd/{{ item }}" dest: "{{ services_service_user_home }}/.config/systemd/user/{{ item }}" mode: 0600 loop: @@ -61,7 +61,7 @@ - name: "configure rsync-certificates service" ansible.builtin.template: - src: "./systemd/{{ item }}.j2" + src: "./systemd/{{ item }}" dest: "{{ services_service_user_home }}/.config/systemd/user/{{ item }}" mode: 0600 loop: diff --git a/playbooks/roles/services/deploy/lrproxy/templates/systemd/container-lrproxy-nginx.service.j2 b/playbooks/roles/services/deploy/lrproxy/templates/systemd/container-lrproxy-nginx.service similarity index 100% rename from playbooks/roles/services/deploy/lrproxy/templates/systemd/container-lrproxy-nginx.service.j2 rename to playbooks/roles/services/deploy/lrproxy/templates/systemd/container-lrproxy-nginx.service diff --git a/playbooks/roles/services/deploy/lrproxy/templates/systemd/pod-lrproxy.service.j2 b/playbooks/roles/services/deploy/lrproxy/templates/systemd/pod-lrproxy.service similarity index 100% rename from playbooks/roles/services/deploy/lrproxy/templates/systemd/pod-lrproxy.service.j2 rename to playbooks/roles/services/deploy/lrproxy/templates/systemd/pod-lrproxy.service diff --git a/playbooks/roles/services/deploy/lrproxy/templates/systemd/rsync-certificates.service.j2 b/playbooks/roles/services/deploy/lrproxy/templates/systemd/rsync-certificates.service similarity index 100% rename from playbooks/roles/services/deploy/lrproxy/templates/systemd/rsync-certificates.service.j2 rename to playbooks/roles/services/deploy/lrproxy/templates/systemd/rsync-certificates.service diff --git a/playbooks/roles/services/deploy/lrproxy/templates/systemd/rsync-certificates.timer.j2 b/playbooks/roles/services/deploy/lrproxy/templates/systemd/rsync-certificates.timer similarity index 100% rename from playbooks/roles/services/deploy/lrproxy/templates/systemd/rsync-certificates.timer.j2 rename to playbooks/roles/services/deploy/lrproxy/templates/systemd/rsync-certificates.timer diff --git a/playbooks/roles/services/deploy/music/tasks/main.yml b/playbooks/roles/services/deploy/music/tasks/main.yml index 9a20f5f..f388a1a 100644 --- a/playbooks/roles/services/deploy/music/tasks/main.yml +++ b/playbooks/roles/services/deploy/music/tasks/main.yml @@ -13,7 +13,7 @@ - name: "configure systemd service" ansible.builtin.template: - src: "./systemd/{{ item }}.j2" + src: "./systemd/{{ item }}" dest: "{{ services_service_user_home }}/.config/systemd/user/{{ item }}" mode: 0600 loop: diff --git a/playbooks/roles/services/deploy/music/templates/systemd/container-music-archive.service.j2 b/playbooks/roles/services/deploy/music/templates/systemd/container-music-archive.service similarity index 100% rename from playbooks/roles/services/deploy/music/templates/systemd/container-music-archive.service.j2 rename to playbooks/roles/services/deploy/music/templates/systemd/container-music-archive.service diff --git a/playbooks/roles/services/deploy/music/templates/systemd/container-music-collection.service.j2 b/playbooks/roles/services/deploy/music/templates/systemd/container-music-collection.service similarity index 100% rename from playbooks/roles/services/deploy/music/templates/systemd/container-music-collection.service.j2 rename to playbooks/roles/services/deploy/music/templates/systemd/container-music-collection.service diff --git a/playbooks/roles/services/deploy/music/templates/systemd/pod-music.service.j2 b/playbooks/roles/services/deploy/music/templates/systemd/pod-music.service similarity index 100% rename from playbooks/roles/services/deploy/music/templates/systemd/pod-music.service.j2 rename to playbooks/roles/services/deploy/music/templates/systemd/pod-music.service diff --git a/playbooks/roles/services/deploy/notes/tasks/main.yml b/playbooks/roles/services/deploy/notes/tasks/main.yml index 50c76ee..2416603 100644 --- a/playbooks/roles/services/deploy/notes/tasks/main.yml +++ b/playbooks/roles/services/deploy/notes/tasks/main.yml @@ -13,7 +13,7 @@ - name: "configure systemd service" ansible.builtin.template: - src: "./systemd/{{ item }}.j2" + src: "./systemd/{{ item }}" dest: "{{ services_service_user_home }}/.config/systemd/user/{{ item }}" mode: 0600 loop: diff --git a/playbooks/roles/services/deploy/notes/templates/systemd/container-notes-chown.service.j2 b/playbooks/roles/services/deploy/notes/templates/systemd/container-notes-chown.service similarity index 100% rename from playbooks/roles/services/deploy/notes/templates/systemd/container-notes-chown.service.j2 rename to playbooks/roles/services/deploy/notes/templates/systemd/container-notes-chown.service diff --git a/playbooks/roles/services/deploy/notes/templates/systemd/container-notes-joplin.service.j2 b/playbooks/roles/services/deploy/notes/templates/systemd/container-notes-joplin.service similarity index 100% rename from playbooks/roles/services/deploy/notes/templates/systemd/container-notes-joplin.service.j2 rename to playbooks/roles/services/deploy/notes/templates/systemd/container-notes-joplin.service diff --git a/playbooks/roles/services/deploy/notes/templates/systemd/pod-notes.service.j2 b/playbooks/roles/services/deploy/notes/templates/systemd/pod-notes.service similarity index 100% rename from playbooks/roles/services/deploy/notes/templates/systemd/pod-notes.service.j2 rename to playbooks/roles/services/deploy/notes/templates/systemd/pod-notes.service diff --git a/playbooks/roles/services/deploy/rproxy/tasks/main.yml b/playbooks/roles/services/deploy/rproxy/tasks/main.yml index 8017de9..b8e8a05 100644 --- a/playbooks/roles/services/deploy/rproxy/tasks/main.yml +++ b/playbooks/roles/services/deploy/rproxy/tasks/main.yml @@ -32,7 +32,7 @@ - name: "configure systemd service" ansible.builtin.template: - src: "./systemd/{{ item }}.j2" + src: "./systemd/{{ item }}" dest: "{{ services_service_user_home }}/.config/systemd/user/{{ item }}" mode: 0600 loop: diff --git a/playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-certbot.service.j2 b/playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-certbot.service similarity index 100% rename from playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-certbot.service.j2 rename to playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-certbot.service diff --git a/playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-certbot.timer.j2 b/playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-certbot.timer similarity index 100% rename from playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-certbot.timer.j2 rename to playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-certbot.timer diff --git a/playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-nginx.service.j2 b/playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-nginx.service similarity index 100% rename from playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-nginx.service.j2 rename to playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-nginx.service diff --git a/playbooks/roles/services/deploy/rproxy/templates/systemd/pod-rproxy.service.j2 b/playbooks/roles/services/deploy/rproxy/templates/systemd/pod-rproxy.service similarity index 100% rename from playbooks/roles/services/deploy/rproxy/templates/systemd/pod-rproxy.service.j2 rename to playbooks/roles/services/deploy/rproxy/templates/systemd/pod-rproxy.service diff --git a/playbooks/roles/services/deploy/www/tasks/main.yml b/playbooks/roles/services/deploy/www/tasks/main.yml index 418954f..65a2536 100644 --- a/playbooks/roles/services/deploy/www/tasks/main.yml +++ b/playbooks/roles/services/deploy/www/tasks/main.yml @@ -27,7 +27,7 @@ - name: "pin hugo version" ansible.builtin.template: - src: "./hugo/apt.j2" + src: "./hugo/apt" dest: "/etc/apt/preferences.d/hugo" mode: 0644 @@ -38,7 +38,7 @@ - name: "configure systemd service" ansible.builtin.template: - src: "./systemd/{{ item }}.j2" + src: "./systemd/{{ item }}" dest: "{{ services_service_user_home }}/.config/systemd/user/{{ item }}" mode: 0600 loop: diff --git a/playbooks/roles/services/deploy/www/templates/hugo/apt.j2 b/playbooks/roles/services/deploy/www/templates/hugo/apt similarity index 100% rename from playbooks/roles/services/deploy/www/templates/hugo/apt.j2 rename to playbooks/roles/services/deploy/www/templates/hugo/apt diff --git a/playbooks/roles/services/deploy/www/templates/systemd/container-www-nginx.service.j2 b/playbooks/roles/services/deploy/www/templates/systemd/container-www-nginx.service similarity index 100% rename from playbooks/roles/services/deploy/www/templates/systemd/container-www-nginx.service.j2 rename to playbooks/roles/services/deploy/www/templates/systemd/container-www-nginx.service diff --git a/playbooks/roles/services/deploy/www/templates/systemd/pod-www.service.j2 b/playbooks/roles/services/deploy/www/templates/systemd/pod-www.service similarity index 100% rename from playbooks/roles/services/deploy/www/templates/systemd/pod-www.service.j2 rename to playbooks/roles/services/deploy/www/templates/systemd/pod-www.service diff --git a/playbooks/roles/services/setup/system/tasks/include/veth.yml b/playbooks/roles/services/setup/system/tasks/include/veth.yml index b2da1e1..4c9a82a 100644 --- a/playbooks/roles/services/setup/system/tasks/include/veth.yml +++ b/playbooks/roles/services/setup/system/tasks/include/veth.yml @@ -8,7 +8,7 @@ - name: "veth : configure connect-pod-service path trigger" ansible.builtin.template: - src: "./veth/connect-pod-service@.path.j2" + src: "./veth/connect-pod-service@.path" dest: "/etc/systemd/system/connect-pod-service@.path" mode: 0644 register: services_setup_system_connect_pod_service_path_file diff --git a/playbooks/roles/services/setup/system/templates/veth/connect-pod-service@.path.j2 b/playbooks/roles/services/setup/system/templates/veth/connect-pod-service@.path similarity index 100% rename from playbooks/roles/services/setup/system/templates/veth/connect-pod-service@.path.j2 rename to playbooks/roles/services/setup/system/templates/veth/connect-pod-service@.path diff --git a/playbooks/roles/services/setup/user/tasks/include/podman.yml b/playbooks/roles/services/setup/user/tasks/include/podman.yml index 0859230..99f49ed 100644 --- a/playbooks/roles/services/setup/user/tasks/include/podman.yml +++ b/playbooks/roles/services/setup/user/tasks/include/podman.yml @@ -9,7 +9,7 @@ - name: "{{ services_service_name }} : podman : configure podman storage" ansible.builtin.template: - src: "./podman/storage.conf.j2" + src: "./podman/storage.conf" dest: "{{ services_service_user_home }}/.config/containers/storage.conf" mode: 0644 register: services_setup_user_containers_storage diff --git a/playbooks/roles/services/setup/user/tasks/include/veth.yml b/playbooks/roles/services/setup/user/tasks/include/veth.yml index 7fcc3e1..09c8929 100644 --- a/playbooks/roles/services/setup/user/tasks/include/veth.yml +++ b/playbooks/roles/services/setup/user/tasks/include/veth.yml @@ -1,7 +1,7 @@ --- - name: "{{ services_service_name }} : veth : configure interface" ansible.builtin.template: - src: "./veth/interface.j2" + src: "./veth/interface" dest: "/etc/network/interfaces.d/{{ services_service_iface_name }}" mode: 0644 validate: > diff --git a/playbooks/roles/services/setup/user/templates/podman/storage.conf.j2 b/playbooks/roles/services/setup/user/templates/podman/storage.conf similarity index 100% rename from playbooks/roles/services/setup/user/templates/podman/storage.conf.j2 rename to playbooks/roles/services/setup/user/templates/podman/storage.conf diff --git a/playbooks/roles/services/setup/user/templates/veth/interface.j2 b/playbooks/roles/services/setup/user/templates/veth/interface similarity index 100% rename from playbooks/roles/services/setup/user/templates/veth/interface.j2 rename to playbooks/roles/services/setup/user/templates/veth/interface diff --git a/playbooks/roles/system/zfs/tasks/include/scrub.yml b/playbooks/roles/system/zfs/tasks/include/scrub.yml index 0fc46b0..24cdba4 100644 --- a/playbooks/roles/system/zfs/tasks/include/scrub.yml +++ b/playbooks/roles/system/zfs/tasks/include/scrub.yml @@ -1,7 +1,7 @@ --- - name: "scrub : zpool status mail script" ansible.builtin.template: - src: "./scrub/systemd-mail-zpool-status.j2" + src: "./scrub/systemd-mail-zpool-status" dest: "/usr/local/sbin/systemd-mail-zpool-status" mode: 0755 diff --git a/playbooks/roles/system/zfs/templates/scrub/systemd-mail-zpool-status.j2 b/playbooks/roles/system/zfs/templates/scrub/systemd-mail-zpool-status similarity index 100% rename from playbooks/roles/system/zfs/templates/scrub/systemd-mail-zpool-status.j2 rename to playbooks/roles/system/zfs/templates/scrub/systemd-mail-zpool-status diff --git a/roles b/roles index 29af37d..024b0c7 160000 --- a/roles +++ b/roles @@ -1 +1 @@ -Subproject commit 29af37dd83840fecfdcb59e76e3d65c962228ac0 +Subproject commit 024b0c7fcc129d832b2fa1933dcd12da4b25ea61