Tidy up systemd files

playbooks/roles/services/deploy/database/templates/systemd/pod-database.service

@@ -12,7 +12,12 @@ Environment=PODMAN_SYSTEMD_UNIT=%n
 Restart=on-failure
 TimeoutStopSec=70
 ExecStartPre=/bin/rm -f %t/pod-database.pid %t/pod-database.pod-id
-ExecStartPre=/usr/bin/podman pod create --infra-conmon-pidfile %t/pod-database.pid --pod-id-file %t/pod-database.pod-id --name=database --network=none --replace
+ExecStartPre=/usr/bin/podman pod create \
+    --infra-conmon-pidfile %t/pod-database.pid \
+    --pod-id-file %t/pod-database.pod-id \
+    --name=database \
+    --network=none \
+    --replace
 ExecStart=/usr/bin/podman pod start --pod-id-file %t/pod-database.pod-id
 ExecStartPost=/usr/bin/sh -c 'podman inspect --format "{% raw %}{{ .State.Pid }}{% endraw %}" $(podman inspect --format "{% raw %}{{ .InfraContainerID }}{% endraw %}" database) > {{ services_containers_directory }}/pod-database/pidfile'
 ExecStartPost=/usr/bin/sudo /usr/sbin/ifdown --ignore-errors veth-database

playbooks/roles/services/deploy/music/templates/systemd/pod-music.service

@@ -12,7 +12,12 @@ Environment=PODMAN_SYSTEMD_UNIT=%n
 Restart=on-failure
 TimeoutStopSec=70
 ExecStartPre=/bin/rm -f %t/pod-music.pid %t/pod-music.pod-id
-ExecStartPre=/usr/bin/podman pod create --infra-conmon-pidfile %t/pod-music.pid --pod-id-file %t/pod-music.pod-id --name=music --network=none --replace
+ExecStartPre=/usr/bin/podman pod create \
+    --infra-conmon-pidfile %t/pod-music.pid \
+    --pod-id-file %t/pod-music.pod-id \
+    --name=music \
+    --network=none \
+    --replace
 ExecStart=/usr/bin/podman pod start --pod-id-file %t/pod-music.pod-id
 ExecStartPost=/usr/bin/sh -c 'podman inspect --format "{% raw %}{{ .State.Pid }}{% endraw %}" $(podman inspect --format "{% raw %}{{ .InfraContainerID }}{% endraw %}" music) > {{ services_containers_directory }}/pod-music/pidfile'
 ExecStartPost=/usr/bin/sudo /usr/sbin/ifdown --ignore-errors veth-music

playbooks/roles/services/deploy/www/templates/systemd/container-www-nginx.service

@@ -16,8 +16,7 @@ ExecStart=/usr/bin/podman run \
     --conmon-pidfile %t/container-www-nginx.pid \
     --cidfile %t/container-www-nginx.ctr-id \
     --cgroups=no-conmon \
-                          --pod-id-file \
+    --pod-id-file %t/pod-www.pod-id \
-                          %t/pod-www.pod-id \
     --replace \
     --label "io.containers.autoupdate=image" \
     --log-driver=journald \

playbooks/roles/services/deploy/www/templates/systemd/pod-www.service

@@ -12,9 +12,14 @@ Environment=PODMAN_SYSTEMD_UNIT=%n
 Restart=on-failure
 TimeoutStopSec=70
 ExecStartPre=/bin/rm -f %t/pod-www.pid %t/pod-www.pod-id
-ExecStartPre=/usr/bin/podman pod create --infra-conmon-pidfile %t/pod-www.pid --pod-id-file %t/pod-www.pod-id --name=rproxy --network=none --replace
+ExecStartPre=/usr/bin/podman pod create \
+    --infra-conmon-pidfile %t/pod-www.pid \
+    --pod-id-file %t/pod-www.pod-id \
+    --name=www \
+    --network=none \
+    --replace
 ExecStart=/usr/bin/podman pod start --pod-id-file %t/pod-www.pod-id
-ExecStartPost=/usr/bin/sh -c 'podman inspect --format "{% raw %}{{ .State.Pid }}{% endraw %}" $(podman inspect --format "{% raw %}{{ .InfraContainerID }}{% endraw %}" rproxy) > {{ services_containers_directory }}/pod-www/pidfile'
+ExecStartPost=/usr/bin/sh -c 'podman inspect --format "{% raw %}{{ .State.Pid }}{% endraw %}" $(podman inspect --format "{% raw %}{{ .InfraContainerID }}{% endraw %}" www) > {{ services_containers_directory }}/pod-www/pidfile'
 ExecStartPost=/usr/bin/sudo /usr/sbin/ifdown --ignore-errors veth-www
 ExecStartPost=/usr/bin/sudo /usr/sbin/ifup veth-www
 ExecStop=/usr/bin/sudo /usr/sbin/ifdown --ignore-errors veth-www