diff --git a/playbooks/roles/services/deploy/cloud/tasks/main.yml b/playbooks/roles/services/deploy/cloud/tasks/main.yml index 5bdb9e9..73d7eea 100644 --- a/playbooks/roles/services/deploy/cloud/tasks/main.yml +++ b/playbooks/roles/services/deploy/cloud/tasks/main.yml @@ -38,11 +38,11 @@ mode: 0600 loop: - "pod-cloud.service" - - "container-cloud-nginx.service" - - "container-cloud-redis.service" - - "container-cloud-chown.service" - - "container-cloud-nextcloud.service" - - "container-cloud-cron.service" + - "pod-cloud-chown.service" + - "pod-cloud-cron.service" + - "pod-cloud-nextcloud.service" + - "pod-cloud-nginx.service" + - "pod-cloud-redis.service" register: services_deploy_cloud_systemd_files - name: "systemd user daemon reload" diff --git a/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-chown.service b/playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud-chown.service similarity index 69% rename from playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-chown.service rename to playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud-chown.service index ea58fa4..59e70ff 100644 --- a/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-chown.service +++ b/playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud-chown.service @@ -1,17 +1,17 @@ [Unit] -Description=Podman container-cloud-chown.service +Description=Podman pod-cloud-chown.service Documentation=man:podman-generate-systemd(1) After=pod-cloud.service -Before=container-cloud-nextcloud.service +Before=pod-cloud-nextcloud.service OnFailure=status-mail@%n.service [Service] Environment=PODMAN_SYSTEMD_UNIT=%n TimeoutStopSec=70 -ExecStartPre=/bin/rm -f %t/container-cloud-chown.pid %t/container-cloud-chown.ctr-id +ExecStartPre=/bin/rm -f %t/pod-cloud-chown.pid %t/pod-cloud-chown.ctr-id ExecStart=/usr/bin/podman run \ - --conmon-pidfile %t/container-cloud-chown.pid \ - --cidfile %t/container-cloud-chown.ctr-id \ + --conmon-pidfile %t/pod-cloud-chown.pid \ + --cidfile %t/pod-cloud-chown.ctr-id \ --cgroups=no-conmon \ --pod-id-file %t/pod-cloud.pod-id \ --replace \ @@ -23,7 +23,7 @@ ExecStart=/usr/bin/podman run \ --name=pod-cloud-chown \ docker.io/library/nextcloud:{{ services_service_deploy_versions.nextcloud }} \ -c "chown -R www-data:www-data /var/www/html /media/external" -ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/container-cloud-chown.ctr-id +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/pod-cloud-chown.ctr-id Type=oneshot [Install] diff --git a/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-cron.service b/playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud-cron.service similarity index 63% rename from playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-cron.service rename to playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud-cron.service index 51609cf..e434877 100644 --- a/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-cron.service +++ b/playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud-cron.service @@ -1,20 +1,20 @@ [Unit] -Description=Podman container-cloud-cron.service +Description=Podman pod-cloud-cron.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target -BindsTo=pod-cloud.service container-cloud-nextcloud.service -After=pod-cloud.service container-cloud-nextcloud.service +BindsTo=pod-cloud.service pod-cloud-nextcloud.service +After=pod-cloud.service pod-cloud-nextcloud.service OnFailure=status-mail@%n.service [Service] Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStartPre=/bin/rm -f %t/container-cloud-cron.pid %t/container-cloud-cron.ctr-id +ExecStartPre=/bin/rm -f %t/pod-cloud-cron.pid %t/pod-cloud-cron.ctr-id ExecStart=/usr/bin/podman run \ - --conmon-pidfile %t/container-cloud-cron.pid \ - --cidfile %t/container-cloud-cron.ctr-id \ + --conmon-pidfile %t/pod-cloud-cron.pid \ + --cidfile %t/pod-cloud-cron.ctr-id \ --cgroups=no-conmon \ --pod-id-file %t/pod-cloud.pod-id \ --replace \ @@ -29,9 +29,9 @@ ExecStart=/usr/bin/podman run \ --name=pod-cloud-cron \ docker.io/library/nextcloud:{{ services_service_deploy_versions.nextcloud }} \ /cron.sh -ExecStop=/usr/bin/podman stop --ignore --cidfile %t/container-cloud-cron.ctr-id -t 10 -ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/container-cloud-cron.ctr-id -PIDFile=%t/container-cloud-cron.pid +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/pod-cloud-cron.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/pod-cloud-cron.ctr-id +PIDFile=%t/pod-cloud-cron.pid Type=forking [Install] diff --git a/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nextcloud.service b/playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud-nextcloud.service similarity index 70% rename from playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nextcloud.service rename to playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud-nextcloud.service index 872503c..79cc8ff 100644 --- a/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nextcloud.service +++ b/playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud-nextcloud.service @@ -1,24 +1,24 @@ [Unit] -Description=Podman container-cloud-nextcloud.service +Description=Podman pod-cloud-nextcloud.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target -BindsTo=pod-cloud.service container-cloud-redis.service -After=pod-cloud.service container-cloud-redis.service -Requires=container-cloud-chown.service -After=container-cloud-chown.service -Wants=container-cloud-cron.service container-cloud-nginx.service -Before=container-cloud-cron.service container-cloud-nginx.service +BindsTo=pod-cloud.service pod-cloud-redis.service +After=pod-cloud.service pod-cloud-redis.service +Requires=pod-cloud-chown.service +After=pod-cloud-chown.service +Wants=pod-cloud-cron.service pod-cloud-nginx.service +Before=pod-cloud-cron.service pod-cloud-nginx.service OnFailure=status-mail@%n.service [Service] Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStartPre=/bin/rm -f %t/container-cloud-nextcloud.pid %t/container-cloud-nextcloud.ctr-id +ExecStartPre=/bin/rm -f %t/pod-cloud-nextcloud.pid %t/pod-cloud-nextcloud.ctr-id ExecStart=/usr/bin/podman run \ - --conmon-pidfile %t/container-cloud-nextcloud.pid \ - --cidfile %t/container-cloud-nextcloud.ctr-id \ + --conmon-pidfile %t/pod-cloud-nextcloud.pid \ + --cidfile %t/pod-cloud-nextcloud.ctr-id \ --cgroups=no-conmon \ --pod-id-file %t/pod-cloud.pod-id \ --replace \ @@ -50,9 +50,9 @@ ExecStart=/usr/bin/podman run \ -e MAIL_DOMAIN="{{ services[services_service_name].domain }}" \ --name=pod-cloud-nextcloud \ docker.io/library/nextcloud:{{ services_service_deploy_versions.nextcloud }} -ExecStop=/usr/bin/podman stop --ignore --cidfile %t/container-cloud-nextcloud.ctr-id -t 10 -ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/container-cloud-nextcloud.ctr-id -PIDFile=%t/container-cloud-nextcloud.pid +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/pod-cloud-nextcloud.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/pod-cloud-nextcloud.ctr-id +PIDFile=%t/pod-cloud-nextcloud.pid Type=forking [Install] diff --git a/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nginx.service b/playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud-nginx.service similarity index 60% rename from playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nginx.service rename to playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud-nginx.service index b05710e..2173b88 100644 --- a/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-nginx.service +++ b/playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud-nginx.service @@ -1,20 +1,20 @@ [Unit] -Description=Podman container-cloud-nginx.service +Description=Podman pod-cloud-nginx.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target -BindsTo=pod-cloud.service container-cloud-nextcloud.service -After=pod-cloud.service container-cloud-nextcloud.service +BindsTo=pod-cloud.service pod-cloud-nextcloud.service +After=pod-cloud.service pod-cloud-nextcloud.service OnFailure=status-mail@%n.service [Service] Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStartPre=/bin/rm -f %t/container-cloud-nginx.pid %t/container-cloud-nginx.ctr-id +ExecStartPre=/bin/rm -f %t/pod-cloud-nginx.pid %t/pod-cloud-nginx.ctr-id ExecStart=/usr/bin/podman run \ - --conmon-pidfile %t/container-cloud-nginx.pid \ - --cidfile %t/container-cloud-nginx.ctr-id \ + --conmon-pidfile %t/pod-cloud-nginx.pid \ + --cidfile %t/pod-cloud-nginx.ctr-id \ --cgroups=no-conmon \ --pod-id-file %t/pod-cloud.pod-id \ --replace \ @@ -27,9 +27,9 @@ ExecStart=/usr/bin/podman run \ -v {{ services_data_directory }}/pod-cloud/data/_data:/var/www/html/data \ --name=pod-cloud-nginx \ docker.io/library/nginx:{{ services_service_deploy_versions.nginx }} -ExecStop=/usr/bin/podman stop --ignore --cidfile %t/container-cloud-nginx.ctr-id -t 10 -ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/container-cloud-nginx.ctr-id -PIDFile=%t/container-cloud-nginx.pid +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/pod-cloud-nginx.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/pod-cloud-nginx.ctr-id +PIDFile=%t/pod-cloud-nginx.pid Type=forking [Install] diff --git a/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-redis.service b/playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud-redis.service similarity index 62% rename from playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-redis.service rename to playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud-redis.service index 5f44458..fb43e02 100644 --- a/playbooks/roles/services/deploy/cloud/templates/systemd/container-cloud-redis.service +++ b/playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud-redis.service @@ -1,5 +1,5 @@ [Unit] -Description=Podman container-cloud-redis.service +Description=Podman pod-cloud-redis.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target @@ -11,10 +11,10 @@ OnFailure=status-mail@%n.service Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStartPre=/bin/rm -f %t/container-cloud-redis.pid %t/container-cloud-redis.ctr-id +ExecStartPre=/bin/rm -f %t/pod-cloud-redis.pid %t/pod-cloud-redis.ctr-id ExecStart=/usr/bin/podman run \ - --conmon-pidfile %t/container-cloud-redis.pid \ - --cidfile %t/container-cloud-redis.ctr-id \ + --conmon-pidfile %t/pod-cloud-redis.pid \ + --cidfile %t/pod-cloud-redis.ctr-id \ --cgroups=no-conmon \ --pod-id-file %t/pod-cloud.pod-id \ --replace \ @@ -25,9 +25,9 @@ ExecStart=/usr/bin/podman run \ -v pod-cloud-redis---data:/data \ --name=pod-cloud-redis \ docker.io/library/redis:{{ services_service_deploy_versions.redis }} -ExecStop=/usr/bin/podman stop --ignore --cidfile %t/container-cloud-redis.ctr-id -t 10 -ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/container-cloud-redis.ctr-id -PIDFile=%t/container-cloud-redis.pid +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/pod-cloud-redis.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/pod-cloud-redis.ctr-id +PIDFile=%t/pod-cloud-redis.pid Type=forking [Install] diff --git a/playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud.service b/playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud.service index a1db48c..f7e4f67 100644 --- a/playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud.service +++ b/playbooks/roles/services/deploy/cloud/templates/systemd/pod-cloud.service @@ -3,8 +3,8 @@ Description=Podman pod-cloud.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target -Wants=container-cloud-nextcloud.service -Before=container-cloud-nextcloud.service +Wants=pod-cloud-nextcloud.service +Before=pod-cloud-nextcloud.service OnFailure=status-mail@%n.service [Service] diff --git a/playbooks/roles/services/deploy/dash/tasks/main.yml b/playbooks/roles/services/deploy/dash/tasks/main.yml index 4f79bc3..7898f33 100644 --- a/playbooks/roles/services/deploy/dash/tasks/main.yml +++ b/playbooks/roles/services/deploy/dash/tasks/main.yml @@ -25,7 +25,7 @@ mode: 0600 loop: - "pod-dash.service" - - "container-dash-grafana.service" + - "pod-dash-grafana.service" register: services_deploy_dash_systemd_files - name: "systemd user daemon reload" diff --git a/playbooks/roles/services/deploy/dash/templates/systemd/container-dash-grafana.service b/playbooks/roles/services/deploy/dash/templates/systemd/pod-dash-grafana.service similarity index 64% rename from playbooks/roles/services/deploy/dash/templates/systemd/container-dash-grafana.service rename to playbooks/roles/services/deploy/dash/templates/systemd/pod-dash-grafana.service index 818e4bb..611903b 100644 --- a/playbooks/roles/services/deploy/dash/templates/systemd/container-dash-grafana.service +++ b/playbooks/roles/services/deploy/dash/templates/systemd/pod-dash-grafana.service @@ -1,5 +1,5 @@ [Unit] -Description=Podman container-dash-grafana.service +Description=Podman pod-dash-grafana.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target @@ -11,10 +11,10 @@ OnFailure=status-mail@%n.service Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStartPre=/bin/rm -f %t/container-dash-grafana.pid %t/container-dash-grafana.ctr-id +ExecStartPre=/bin/rm -f %t/pod-dash-grafana.pid %t/pod-dash-grafana.ctr-id ExecStart=/usr/bin/podman run \ - --conmon-pidfile %t/container-dash-grafana.pid \ - --cidfile %t/container-dash-grafana.ctr-id \ + --conmon-pidfile %t/pod-dash-grafana.pid \ + --cidfile %t/pod-dash-grafana.ctr-id \ --cgroups=no-conmon \ --pod-id-file %t/pod-dash.pod-id \ --replace \ @@ -26,9 +26,9 @@ ExecStart=/usr/bin/podman run \ -v {{ services_data_directory }}/pod-dash/data/_data:/var/lib/grafana:U \ --name=pod-dash-grafana \ docker.io/grafana/grafana:{{ services_service_deploy_versions.grafana }} -ExecStop=/usr/bin/podman stop --ignore --cidfile %t/container-dash-grafana.ctr-id -t 10 -ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/container-dash-grafana.ctr-id -PIDFile=%t/container-dash-grafana.pid +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/pod-dash-grafana.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/pod-dash-grafana.ctr-id +PIDFile=%t/pod-dash-grafana.pid Type=forking [Install] diff --git a/playbooks/roles/services/deploy/dash/templates/systemd/pod-dash.service b/playbooks/roles/services/deploy/dash/templates/systemd/pod-dash.service index 1b94b2c..a4210da 100644 --- a/playbooks/roles/services/deploy/dash/templates/systemd/pod-dash.service +++ b/playbooks/roles/services/deploy/dash/templates/systemd/pod-dash.service @@ -3,8 +3,8 @@ Description=Podman pod-dash.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target -Wants=container-dash-grafana.service -Before=container-dash-grafana.service +Wants=pod-dash-grafana.service +Before=pod-dash-grafana.service OnFailure=status-mail@%n.service [Service] diff --git a/playbooks/roles/services/deploy/database/tasks/main.yml b/playbooks/roles/services/deploy/database/tasks/main.yml index a2663cc..541b6b5 100644 --- a/playbooks/roles/services/deploy/database/tasks/main.yml +++ b/playbooks/roles/services/deploy/database/tasks/main.yml @@ -39,8 +39,8 @@ mode: 0600 loop: - "pod-database.service" - - "container-database-postgres.service" - - "container-database-pgadmin.service" + - "pod-database-postgres.service" + - "pod-database-pgadmin.service" register: services_deploy_database_systemd_files - name: "systemd user daemon reload" diff --git a/playbooks/roles/services/deploy/database/templates/systemd/container-database-pgadmin.service b/playbooks/roles/services/deploy/database/templates/systemd/pod-database-pgadmin.service similarity index 61% rename from playbooks/roles/services/deploy/database/templates/systemd/container-database-pgadmin.service rename to playbooks/roles/services/deploy/database/templates/systemd/pod-database-pgadmin.service index 5bb82ba..d357c5f 100644 --- a/playbooks/roles/services/deploy/database/templates/systemd/container-database-pgadmin.service +++ b/playbooks/roles/services/deploy/database/templates/systemd/pod-database-pgadmin.service @@ -1,20 +1,20 @@ [Unit] -Description=Podman container-database-pgadmin.service +Description=Podman pod-database-pgadmin.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target -BindsTo=pod-database.service container-database-postgres.service -After=pod-database.service container-database-postgres.service +BindsTo=pod-database.service pod-database-postgres.service +After=pod-database.service pod-database-postgres.service OnFailure=status-mail@%n.service [Service] Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStartPre=/bin/rm -f %t/container-database-pgadmin.pid %t/container-database-pgadmin.ctr-id +ExecStartPre=/bin/rm -f %t/pod-database-pgadmin.pid %t/pod-database-pgadmin.ctr-id ExecStart=/usr/bin/podman run \ - --conmon-pidfile %t/container-database-pgadmin.pid \ - --cidfile %t/container-database-pgadmin.ctr-id \ + --conmon-pidfile %t/pod-database-pgadmin.pid \ + --cidfile %t/pod-database-pgadmin.ctr-id \ --cgroups=no-conmon \ --pod-id-file %t/pod-database.pod-id \ --replace \ @@ -28,9 +28,9 @@ ExecStart=/usr/bin/podman run \ -e PGADMIN_DEFAULT_PASSWORD_FILE=/run/secrets/pgadmin.password \ --name=pod-database-pgadmin \ docker.io/dpage/pgadmin4:{{ services_service_deploy_versions.pgadmin4 }} -ExecStop=/usr/bin/podman stop --ignore --cidfile %t/container-database-pgadmin.ctr-id -t 10 -ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/container-database-pgadmin.ctr-id -PIDFile=%t/container-database-pgadmin.pid +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/pod-database-pgadmin.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/pod-database-pgadmin.ctr-id +PIDFile=%t/pod-database-pgadmin.pid Type=forking [Install] diff --git a/playbooks/roles/services/deploy/database/templates/systemd/container-database-postgres.service b/playbooks/roles/services/deploy/database/templates/systemd/pod-database-postgres.service similarity index 65% rename from playbooks/roles/services/deploy/database/templates/systemd/container-database-postgres.service rename to playbooks/roles/services/deploy/database/templates/systemd/pod-database-postgres.service index 82a8d06..1ac6f51 100644 --- a/playbooks/roles/services/deploy/database/templates/systemd/container-database-postgres.service +++ b/playbooks/roles/services/deploy/database/templates/systemd/pod-database-postgres.service @@ -1,22 +1,22 @@ [Unit] -Description=Podman container-database-postgres.service +Description=Podman pod-database-postgres.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target BindsTo=pod-database.service After=pod-database.service -Wants=container-database-pgadmin.service -Before=container-database-pgadmin.service +Wants=pod-database-pgadmin.service +Before=pod-database-pgadmin.service OnFailure=status-mail@%n.service [Service] Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStartPre=/bin/rm -f %t/container-database-postgres.pid %t/container-database-postgres.ctr-id +ExecStartPre=/bin/rm -f %t/pod-database-postgres.pid %t/pod-database-postgres.ctr-id ExecStart=/usr/bin/podman run \ - --conmon-pidfile %t/container-database-postgres.pid \ - --cidfile %t/container-database-postgres.ctr-id \ + --conmon-pidfile %t/pod-database-postgres.pid \ + --cidfile %t/pod-database-postgres.ctr-id \ --cgroups=no-conmon \ --pod-id-file %t/pod-database.pod-id \ --replace \ @@ -31,9 +31,9 @@ ExecStart=/usr/bin/podman run \ -v {{ services_data_directory }}/pod-database/data/_data:/var/lib/postgresql/data \ --name=pod-database-postgres \ docker.io/library/postgres:{{ services_service_deploy_versions.postgres }} -ExecStop=/usr/bin/podman stop --ignore --cidfile %t/container-database-postgres.ctr-id -t 10 -ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/container-database-postgres.ctr-id -PIDFile=%t/container-database-postgres.pid +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/pod-database-postgres.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/pod-database-postgres.ctr-id +PIDFile=%t/pod-database-postgres.pid Type=forking [Install] diff --git a/playbooks/roles/services/deploy/database/templates/systemd/pod-database.service b/playbooks/roles/services/deploy/database/templates/systemd/pod-database.service index 677237d..02cb110 100644 --- a/playbooks/roles/services/deploy/database/templates/systemd/pod-database.service +++ b/playbooks/roles/services/deploy/database/templates/systemd/pod-database.service @@ -3,8 +3,8 @@ Description=Podman pod-database.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target -Wants=container-database-postgres.service -Before=container-database-postgres.service +Wants=pod-database-postgres.service +Before=pod-database-postgres.service OnFailure=status-mail@%n.service [Service] diff --git a/playbooks/roles/services/deploy/git/tasks/main.yml b/playbooks/roles/services/deploy/git/tasks/main.yml index 9fadc2c..8e02f39 100644 --- a/playbooks/roles/services/deploy/git/tasks/main.yml +++ b/playbooks/roles/services/deploy/git/tasks/main.yml @@ -20,7 +20,7 @@ mode: 0600 loop: - "pod-git.service" - - "container-git-gitea.service" + - "pod-git-gitea.service" register: services_deploy_git_systemd_files - name: "systemd user daemon reload" diff --git a/playbooks/roles/services/deploy/git/templates/systemd/container-git-gitea.service b/playbooks/roles/services/deploy/git/templates/systemd/pod-git-gitea.service similarity index 84% rename from playbooks/roles/services/deploy/git/templates/systemd/container-git-gitea.service rename to playbooks/roles/services/deploy/git/templates/systemd/pod-git-gitea.service index 80df48d..4f1b7bc 100644 --- a/playbooks/roles/services/deploy/git/templates/systemd/container-git-gitea.service +++ b/playbooks/roles/services/deploy/git/templates/systemd/pod-git-gitea.service @@ -1,5 +1,5 @@ [Unit] -Description=Podman container-git-gitea.service +Description=Podman pod-git-gitea.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target @@ -11,10 +11,10 @@ OnFailure=status-mail@%n.service Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStartPre=/bin/rm -f %t/container-git-gitea.pid %t/container-git-gitea.ctr-id +ExecStartPre=/bin/rm -f %t/pod-git-gitea.pid %t/pod-git-gitea.ctr-id ExecStart=/usr/bin/podman run \ - --conmon-pidfile %t/container-git-gitea.pid \ - --cidfile %t/container-git-gitea.ctr-id \ + --conmon-pidfile %t/pod-git-gitea.pid \ + --cidfile %t/pod-git-gitea.ctr-id \ --cgroups=no-conmon \ --pod-id-file %t/pod-git.pod-id \ --replace \ @@ -49,9 +49,9 @@ ExecStart=/usr/bin/podman run \ -e GITEA__service__ENABLE_NOTIFY_MAIL="true" \ --name=pod-git-gitea \ docker.io/gitea/gitea:{{ services_service_deploy_versions.gitea }} -ExecStop=/usr/bin/podman stop --ignore --cidfile %t/container-git-gitea.ctr-id -t 10 -ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/container-git-gitea.ctr-id -PIDFile=%t/container-git-gitea.pid +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/pod-git-gitea.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/pod-git-gitea.ctr-id +PIDFile=%t/pod-git-gitea.pid Type=forking [Install] diff --git a/playbooks/roles/services/deploy/git/templates/systemd/pod-git.service b/playbooks/roles/services/deploy/git/templates/systemd/pod-git.service index 38c037d..e1c7e4e 100644 --- a/playbooks/roles/services/deploy/git/templates/systemd/pod-git.service +++ b/playbooks/roles/services/deploy/git/templates/systemd/pod-git.service @@ -3,8 +3,8 @@ Description=Podman pod-git.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target -Wants=container-git-gitea.service -Before=container-git-gitea.service +Wants=pod-git-gitea.service +Before=pod-git-gitea.service OnFailure=status-mail@%n.service [Service] diff --git a/playbooks/roles/services/deploy/metrics/tasks/main.yml b/playbooks/roles/services/deploy/metrics/tasks/main.yml index f2165bd..badbb09 100644 --- a/playbooks/roles/services/deploy/metrics/tasks/main.yml +++ b/playbooks/roles/services/deploy/metrics/tasks/main.yml @@ -27,7 +27,7 @@ mode: 0600 loop: - "pod-metrics.service" - - "container-metrics-prometheus.service" + - "pod-metrics-prometheus.service" register: services_deploy_metrics_systemd_files - name: "systemd user daemon reload" diff --git a/playbooks/roles/services/deploy/metrics/templates/systemd/container-metrics-prometheus.service b/playbooks/roles/services/deploy/metrics/templates/systemd/pod-metrics-prometheus.service similarity index 70% rename from playbooks/roles/services/deploy/metrics/templates/systemd/container-metrics-prometheus.service rename to playbooks/roles/services/deploy/metrics/templates/systemd/pod-metrics-prometheus.service index 0fd88ba..0374701 100644 --- a/playbooks/roles/services/deploy/metrics/templates/systemd/container-metrics-prometheus.service +++ b/playbooks/roles/services/deploy/metrics/templates/systemd/pod-metrics-prometheus.service @@ -1,5 +1,5 @@ [Unit] -Description=Podman container-metrics-prometheus.service +Description=Podman pod-metrics-prometheus.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target @@ -11,10 +11,10 @@ OnFailure=status-mail@%n.service Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStartPre=/bin/rm -f %t/container-metrics-prometheus.pid %t/container-metrics-prometheus.ctr-id +ExecStartPre=/bin/rm -f %t/pod-metrics-prometheus.pid %t/pod-metrics-prometheus.ctr-id ExecStart=/usr/bin/podman run \ - --conmon-pidfile %t/container-metrics-prometheus.pid \ - --cidfile %t/container-metrics-prometheus.ctr-id \ + --conmon-pidfile %t/pod-metrics-prometheus.pid \ + --cidfile %t/pod-metrics-prometheus.ctr-id \ --cgroups=no-conmon \ --pod-id-file %t/pod-metrics.pod-id \ --replace \ @@ -30,9 +30,9 @@ ExecStart=/usr/bin/podman run \ # Careful about appending CLI arguments - in addition to the new arguments, all the arguments from # the upstream Dockerfile must also be re-appended and it is not possible it use the configuration # file to configure some arguments: https://github.com/prometheus/prometheus/issues/6188 -ExecStop=/usr/bin/podman stop --ignore --cidfile %t/container-metrics-prometheus.ctr-id -t 10 -ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/container-metrics-prometheus.ctr-id -PIDFile=%t/container-metrics-prometheus.pid +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/pod-metrics-prometheus.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/pod-metrics-prometheus.ctr-id +PIDFile=%t/pod-metrics-prometheus.pid Type=forking [Install] diff --git a/playbooks/roles/services/deploy/metrics/templates/systemd/pod-metrics.service b/playbooks/roles/services/deploy/metrics/templates/systemd/pod-metrics.service index 18e5535..96a7a62 100644 --- a/playbooks/roles/services/deploy/metrics/templates/systemd/pod-metrics.service +++ b/playbooks/roles/services/deploy/metrics/templates/systemd/pod-metrics.service @@ -3,8 +3,8 @@ Description=Podman pod-metrics.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target -Wants=container-metrics-prometheus.service -Before=container-metrics-prometheus.service +Wants=pod-metrics-prometheus.service +Before=pod-metrics-prometheus.service OnFailure=status-mail@%n.service [Service] diff --git a/playbooks/roles/services/deploy/music/tasks/main.yml b/playbooks/roles/services/deploy/music/tasks/main.yml index 2992df5..e23b450 100644 --- a/playbooks/roles/services/deploy/music/tasks/main.yml +++ b/playbooks/roles/services/deploy/music/tasks/main.yml @@ -13,8 +13,8 @@ mode: 0600 loop: - "pod-music.service" - - "container-music-collection.service" - - "container-music-archive.service" + - "pod-music-collection.service" + - "pod-music-archive.service" register: services_deploy_music_systemd_files - name: "systemd user daemon reload" diff --git a/playbooks/roles/services/deploy/music/templates/systemd/container-music-archive.service b/playbooks/roles/services/deploy/music/templates/systemd/pod-music-archive.service similarity index 70% rename from playbooks/roles/services/deploy/music/templates/systemd/container-music-archive.service rename to playbooks/roles/services/deploy/music/templates/systemd/pod-music-archive.service index 1c5d091..cbf9a6f 100644 --- a/playbooks/roles/services/deploy/music/templates/systemd/container-music-archive.service +++ b/playbooks/roles/services/deploy/music/templates/systemd/pod-music-archive.service @@ -1,5 +1,5 @@ [Unit] -Description=Podman container-music-archive.service +Description=Podman pod-music-archive.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target @@ -11,10 +11,10 @@ OnFailure=status-mail@%n.service Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStartPre=/bin/rm -f %t/container-music-archive.pid %t/container-music-archive.ctr-id +ExecStartPre=/bin/rm -f %t/pod-music-archive.pid %t/pod-music-archive.ctr-id ExecStart=/usr/bin/podman run \ - --conmon-pidfile %t/container-music-archive.pid \ - --cidfile %t/container-music-archive.ctr-id \ + --conmon-pidfile %t/pod-music-archive.pid \ + --cidfile %t/pod-music-archive.ctr-id \ --cgroups=no-conmon \ --pod-id-file %t/pod-music.pod-id \ --replace \ @@ -31,9 +31,9 @@ ExecStart=/usr/bin/podman run \ -e ND_PASSWORDENCRYPTIONKEY={{ services[services_service_name].password_encryption_key }} \ --name=pod-music-archive \ docker.io/deluan/navidrome:{{ services_service_deploy_versions.navidrome }} -ExecStop=/usr/bin/podman stop --ignore --cidfile %t/container-music-archive.ctr-id -t 10 -ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/container-music-archive.ctr-id -PIDFile=%t/container-music-archive.pid +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/pod-music-archive.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/pod-music-archive.ctr-id +PIDFile=%t/pod-music-archive.pid Type=forking [Install] diff --git a/playbooks/roles/services/deploy/music/templates/systemd/container-music-collection.service b/playbooks/roles/services/deploy/music/templates/systemd/pod-music-collection.service similarity index 70% rename from playbooks/roles/services/deploy/music/templates/systemd/container-music-collection.service rename to playbooks/roles/services/deploy/music/templates/systemd/pod-music-collection.service index 43fa84c..1643421 100644 --- a/playbooks/roles/services/deploy/music/templates/systemd/container-music-collection.service +++ b/playbooks/roles/services/deploy/music/templates/systemd/pod-music-collection.service @@ -1,5 +1,5 @@ [Unit] -Description=Podman container-music-collection.service +Description=Podman pod-music-collection.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target @@ -11,10 +11,10 @@ OnFailure=status-mail@%n.service Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStartPre=/bin/rm -f %t/container-music-collection.pid %t/container-music-collection.ctr-id +ExecStartPre=/bin/rm -f %t/pod-music-collection.pid %t/pod-music-collection.ctr-id ExecStart=/usr/bin/podman run \ - --conmon-pidfile %t/container-music-collection.pid \ - --cidfile %t/container-music-collection.ctr-id \ + --conmon-pidfile %t/pod-music-collection.pid \ + --cidfile %t/pod-music-collection.ctr-id \ --cgroups=no-conmon \ --pod-id-file %t/pod-music.pod-id \ --replace \ @@ -31,9 +31,9 @@ ExecStart=/usr/bin/podman run \ -e ND_PASSWORDENCRYPTIONKEY={{ services[services_service_name].password_encryption_key }} \ --name=pod-music-collection \ docker.io/deluan/navidrome:{{ services_service_deploy_versions.navidrome }} -ExecStop=/usr/bin/podman stop --ignore --cidfile %t/container-music-collection.ctr-id -t 10 -ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/container-music-collection.ctr-id -PIDFile=%t/container-music-collection.pid +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/pod-music-collection.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/pod-music-collection.ctr-id +PIDFile=%t/pod-music-collection.pid Type=forking [Install] diff --git a/playbooks/roles/services/deploy/music/templates/systemd/pod-music.service b/playbooks/roles/services/deploy/music/templates/systemd/pod-music.service index a873699..7c08907 100644 --- a/playbooks/roles/services/deploy/music/templates/systemd/pod-music.service +++ b/playbooks/roles/services/deploy/music/templates/systemd/pod-music.service @@ -3,8 +3,8 @@ Description=Podman pod-music.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target -Wants=container-music-collection.service container-music-archive.service -Before=container-music-collection.service container-music-archive.service +Wants=pod-music-collection.service pod-music-archive.service +Before=pod-music-collection.service pod-music-archive.service OnFailure=status-mail@%n.service [Service] diff --git a/playbooks/roles/services/deploy/notes/tasks/main.yml b/playbooks/roles/services/deploy/notes/tasks/main.yml index 546a2d1..db4aa43 100644 --- a/playbooks/roles/services/deploy/notes/tasks/main.yml +++ b/playbooks/roles/services/deploy/notes/tasks/main.yml @@ -20,7 +20,7 @@ mode: 0600 loop: - "pod-notes.service" - - "container-notes-joplin.service" + - "pod-notes-joplin.service" register: services_deploy_notes_systemd_files - name: "systemd user daemon reload" diff --git a/playbooks/roles/services/deploy/notes/templates/systemd/container-notes-joplin.service b/playbooks/roles/services/deploy/notes/templates/systemd/pod-notes-joplin.service similarity index 79% rename from playbooks/roles/services/deploy/notes/templates/systemd/container-notes-joplin.service rename to playbooks/roles/services/deploy/notes/templates/systemd/pod-notes-joplin.service index b88f63b..0384da4 100644 --- a/playbooks/roles/services/deploy/notes/templates/systemd/container-notes-joplin.service +++ b/playbooks/roles/services/deploy/notes/templates/systemd/pod-notes-joplin.service @@ -1,5 +1,5 @@ [Unit] -Description=Podman container-notes-joplin.service +Description=Podman pod-notes-joplin.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target @@ -11,10 +11,10 @@ OnFailure=status-mail@%n.service Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStartPre=/bin/rm -f %t/container-notes-joplin.pid %t/container-notes-joplin.ctr-id +ExecStartPre=/bin/rm -f %t/pod-notes-joplin.pid %t/pod-notes-joplin.ctr-id ExecStart=/usr/bin/podman run \ - --conmon-pidfile %t/container-notes-joplin.pid \ - --cidfile %t/container-notes-joplin.ctr-id \ + --conmon-pidfile %t/pod-notes-joplin.pid \ + --cidfile %t/pod-notes-joplin.ctr-id \ --cgroups=no-conmon \ --pod-id-file %t/pod-notes.pod-id \ --replace \ @@ -43,9 +43,9 @@ ExecStart=/usr/bin/podman run \ -e STORAGE_DRIVER="Type=Filesystem; Path=/data" \ --name=pod-notes-joplin \ docker.io/joplin/server:{{ services_service_deploy_versions.joplin }} -ExecStop=/usr/bin/podman stop --ignore --cidfile %t/container-notes-joplin.ctr-id -t 10 -ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/container-notes-joplin.ctr-id -PIDFile=%t/container-notes-joplin.pid +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/pod-notes-joplin.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/pod-notes-joplin.ctr-id +PIDFile=%t/pod-notes-joplin.pid Type=forking [Install] diff --git a/playbooks/roles/services/deploy/notes/templates/systemd/pod-notes.service b/playbooks/roles/services/deploy/notes/templates/systemd/pod-notes.service index c69a910..7b12f49 100644 --- a/playbooks/roles/services/deploy/notes/templates/systemd/pod-notes.service +++ b/playbooks/roles/services/deploy/notes/templates/systemd/pod-notes.service @@ -3,8 +3,8 @@ Description=Podman pod-notes.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target -Wants=container-notes-joplin.service -Before=container-notes-joplin.service +Wants=pod-notes-joplin.service +Before=pod-notes-joplin.service OnFailure=status-mail@%n.service [Service] diff --git a/playbooks/roles/services/deploy/rproxy/tasks/main.yml b/playbooks/roles/services/deploy/rproxy/tasks/main.yml index 9442b67..faa87ea 100644 --- a/playbooks/roles/services/deploy/rproxy/tasks/main.yml +++ b/playbooks/roles/services/deploy/rproxy/tasks/main.yml @@ -57,8 +57,8 @@ mode: 0600 loop: - "pod-rproxy.service" - - "container-rproxy-nginx.service" - - "container-rproxy-certbot.service" + - "pod-rproxy-nginx.service" + - "pod-rproxy-certbot.service" register: services_deploy_rproxy_systemd_files - name: "{{ services_service_name }} : systemd user daemon reload" diff --git a/playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-certbot.service b/playbooks/roles/services/deploy/rproxy/templates/systemd/pod-rproxy-certbot.service similarity index 56% rename from playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-certbot.service rename to playbooks/roles/services/deploy/rproxy/templates/systemd/pod-rproxy-certbot.service index 7c6e43d..86c9a60 100644 --- a/playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-certbot.service +++ b/playbooks/roles/services/deploy/rproxy/templates/systemd/pod-rproxy-certbot.service @@ -1,20 +1,20 @@ [Unit] -Description=Podman container-{{ services_service_name }}-certbot.service +Description=Podman pod-{{ services_service_name }}-certbot.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target -BindsTo=pod-{{ services_service_name }}.service container-{{ services_service_name }}-nginx.service -After=pod-{{ services_service_name }}.service container-{{ services_service_name }}-nginx.service +BindsTo=pod-{{ services_service_name }}.service pod-{{ services_service_name }}-nginx.service +After=pod-{{ services_service_name }}.service pod-{{ services_service_name }}-nginx.service OnFailure=status-mail@%n.service [Service] Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStartPre=/bin/rm -f %t/container-{{ services_service_name }}-certbot.pid %t/container-{{ services_service_name }}-certbot.ctr-id +ExecStartPre=/bin/rm -f %t/pod-{{ services_service_name }}-certbot.pid %t/pod-{{ services_service_name }}-certbot.ctr-id ExecStart=/usr/bin/podman run \ - --conmon-pidfile %t/container-{{ services_service_name }}-certbot.pid \ - --cidfile %t/container-{{ services_service_name }}-certbot.ctr-id \ + --conmon-pidfile %t/pod-{{ services_service_name }}-certbot.pid \ + --cidfile %t/pod-{{ services_service_name }}-certbot.ctr-id \ --cgroups=no-conmon \ --pod-id-file %t/pod-{{ services_service_name }}.pod-id \ --replace \ @@ -31,9 +31,9 @@ ExecStart=/usr/bin/podman run \ --name=pod-{{ services_service_name }}-certbot \ --entrypoint=/usr/sbin/crond \ docker.io/certbot/certbot:{{ services_service_deploy_versions.certbot }} -f -ExecStop=/usr/bin/podman stop --ignore --cidfile %t/container-{{ services_service_name }}-certbot.ctr-id -t 10 -ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/container-{{ services_service_name }}-certbot.ctr-id -PIDFile=%t/container-{{ services_service_name }}-certbot.pid +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/pod-{{ services_service_name }}-certbot.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/pod-{{ services_service_name }}-certbot.ctr-id +PIDFile=%t/pod-{{ services_service_name }}-certbot.pid Type=forking [Install] diff --git a/playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-nginx.service b/playbooks/roles/services/deploy/rproxy/templates/systemd/pod-rproxy-nginx.service similarity index 67% rename from playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-nginx.service rename to playbooks/roles/services/deploy/rproxy/templates/systemd/pod-rproxy-nginx.service index 20cddf5..00def4d 100644 --- a/playbooks/roles/services/deploy/rproxy/templates/systemd/container-rproxy-nginx.service +++ b/playbooks/roles/services/deploy/rproxy/templates/systemd/pod-rproxy-nginx.service @@ -1,12 +1,12 @@ [Unit] -Description=Podman container-{{ services_service_name }}-nginx.service +Description=Podman pod-{{ services_service_name }}-nginx.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target BindsTo=pod-{{ services_service_name }}.service After=pod-{{ services_service_name }}.service -Wants=container-{{ services_service_name }}-certbot.service -Before=container-{{ services_service_name }}-certbot.service +Wants=pod-{{ services_service_name }}-certbot.service +Before=pod-{{ services_service_name }}-certbot.service OnFailure=status-mail@%n.service [Service] @@ -14,10 +14,10 @@ Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 ExecStartPre=/usr/bin/sh -c 'echo resolver $(awk '\''BEGIN{ORS=" "} $1=="nameserver" {print $2}'\'' {{ system_etc_root_directory }}/resolv.conf) ";" > %t/resolver.conf' -ExecStartPre=/bin/rm -f %t/container-{{ services_service_name }}-nginx.pid %t/container-{{ services_service_name }}-nginx.ctr-id +ExecStartPre=/bin/rm -f %t/pod-{{ services_service_name }}-nginx.pid %t/pod-{{ services_service_name }}-nginx.ctr-id ExecStart=/usr/bin/podman run \ - --conmon-pidfile %t/container-{{ services_service_name }}-nginx.pid \ - --cidfile %t/container-{{ services_service_name }}-nginx.ctr-id \ + --conmon-pidfile %t/pod-{{ services_service_name }}-nginx.pid \ + --cidfile %t/pod-{{ services_service_name }}-nginx.ctr-id \ --cgroups=no-conmon \ --pod-id-file %t/pod-{{ services_service_name }}.pod-id \ --replace \ @@ -36,9 +36,9 @@ ExecStart=/usr/bin/podman run \ -v var-www-html:/var/www/html \ --name=pod-{{ services_service_name }}-nginx \ docker.io/library/nginx:{{ services_service_deploy_versions.nginx }} -ExecStop=/usr/bin/podman stop --ignore --cidfile %t/container-{{ services_service_name }}-nginx.ctr-id -t 10 -ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/container-{{ services_service_name }}-nginx.ctr-id -PIDFile=%t/container-{{ services_service_name }}-nginx.pid +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/pod-{{ services_service_name }}-nginx.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/pod-{{ services_service_name }}-nginx.ctr-id +PIDFile=%t/pod-{{ services_service_name }}-nginx.pid Type=forking [Install] diff --git a/playbooks/roles/services/deploy/rproxy/templates/systemd/pod-rproxy.service b/playbooks/roles/services/deploy/rproxy/templates/systemd/pod-rproxy.service index f46ef3b..353fdb6 100644 --- a/playbooks/roles/services/deploy/rproxy/templates/systemd/pod-rproxy.service +++ b/playbooks/roles/services/deploy/rproxy/templates/systemd/pod-rproxy.service @@ -3,8 +3,8 @@ Description=Podman pod-{{ services_service_name }}.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target -Wants=container-{{ services_service_name }}-nginx.service -Before=container-{{ services_service_name }}-nginx.service +Wants=pod-{{ services_service_name }}-nginx.service +Before=pod-{{ services_service_name }}-nginx.service OnFailure=status-mail@%n.service [Service] diff --git a/playbooks/roles/services/deploy/www/tasks/main.yml b/playbooks/roles/services/deploy/www/tasks/main.yml index 44a94be..3e74817 100644 --- a/playbooks/roles/services/deploy/www/tasks/main.yml +++ b/playbooks/roles/services/deploy/www/tasks/main.yml @@ -38,7 +38,7 @@ mode: 0600 loop: - "pod-www.service" - - "container-www-nginx.service" + - "pod-www-nginx.service" register: services_deploy_www_systemd_files - name: "systemd user daemon reload" diff --git a/playbooks/roles/services/deploy/www/templates/systemd/container-www-nginx.service b/playbooks/roles/services/deploy/www/templates/systemd/pod-www-nginx.service similarity index 64% rename from playbooks/roles/services/deploy/www/templates/systemd/container-www-nginx.service rename to playbooks/roles/services/deploy/www/templates/systemd/pod-www-nginx.service index bcca96c..15b3924 100644 --- a/playbooks/roles/services/deploy/www/templates/systemd/container-www-nginx.service +++ b/playbooks/roles/services/deploy/www/templates/systemd/pod-www-nginx.service @@ -1,5 +1,5 @@ [Unit] -Description=Podman container-www-nginx.service +Description=Podman pod-www-nginx.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target @@ -11,10 +11,10 @@ OnFailure=status-mail@%n.service Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStartPre=/bin/rm -f %t/container-www-nginx.pid %t/container-www-nginx.ctr-id +ExecStartPre=/bin/rm -f %t/pod-www-nginx.pid %t/pod-www-nginx.ctr-id ExecStart=/usr/bin/podman run \ - --conmon-pidfile %t/container-www-nginx.pid \ - --cidfile %t/container-www-nginx.ctr-id \ + --conmon-pidfile %t/pod-www-nginx.pid \ + --cidfile %t/pod-www-nginx.ctr-id \ --cgroups=no-conmon \ --pod-id-file %t/pod-www.pod-id \ --replace \ @@ -25,9 +25,9 @@ ExecStart=/usr/bin/podman run \ -v ./.config/service/wojciechkozlowski.eu/public:/usr/share/nginx/html:ro \ --name=pod-www-nginx \ docker.io/library/nginx:{{ services_service_deploy_versions.nginx }} -ExecStop=/usr/bin/podman stop --ignore --cidfile %t/container-www-nginx.ctr-id -t 10 -ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/container-www-nginx.ctr-id -PIDFile=%t/container-www-nginx.pid +ExecStop=/usr/bin/podman stop --ignore --cidfile %t/pod-www-nginx.ctr-id -t 10 +ExecStopPost=/usr/bin/podman rm --ignore -f --cidfile %t/pod-www-nginx.ctr-id +PIDFile=%t/pod-www-nginx.pid Type=forking [Install] diff --git a/playbooks/roles/services/deploy/www/templates/systemd/pod-www.service b/playbooks/roles/services/deploy/www/templates/systemd/pod-www.service index 0a63271..89f5583 100644 --- a/playbooks/roles/services/deploy/www/templates/systemd/pod-www.service +++ b/playbooks/roles/services/deploy/www/templates/systemd/pod-www.service @@ -3,8 +3,8 @@ Description=Podman pod-www.service Documentation=man:podman-generate-systemd(1) Wants=network.target After=network-online.target -Wants=container-www-nginx.service -Before=container-www-nginx.service +Wants=pod-www-nginx.service +Before=pod-www-nginx.service OnFailure=status-mail@%n.service [Service]