From 4be5d17efcb64ed3eb0cdc19892e24b8f972efe9 Mon Sep 17 00:00:00 2001 From: Wojciech Kozlowski Date: Mon, 10 Oct 2022 20:44:43 +0200 Subject: [PATCH] Fix issue with connect veths --- .../common/etc/systemd/system/connect-pod-service@.path.j2 | 2 +- .../home/pod-rproxy/.config/systemd/user/pod-rproxy.service.j2 | 1 - .../home/pod-www/.config/systemd/user/pod-www.service.j2 | 1 - .../pod-lrproxy/.config/systemd/user/pod-lrproxy.service.j2 | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) diff --git a/playbooks/filesystem/common/etc/systemd/system/connect-pod-service@.path.j2 b/playbooks/filesystem/common/etc/systemd/system/connect-pod-service@.path.j2 index 09d7456..f8a9cd9 100644 --- a/playbooks/filesystem/common/etc/systemd/system/connect-pod-service@.path.j2 +++ b/playbooks/filesystem/common/etc/systemd/system/connect-pod-service@.path.j2 @@ -1,5 +1,5 @@ [Path] -PathModified=/var/lib/{{ ansible_hostname }}/containers/pod-%i/pidfile +PathChanged=/var/lib/{{ ansible_hostname }}/containers/pod-%i/pidfile [Install] WantedBy=multi-user.target network.target diff --git a/playbooks/filesystem/valkyrie/var/lib/valkyrie/home/pod-rproxy/.config/systemd/user/pod-rproxy.service.j2 b/playbooks/filesystem/valkyrie/var/lib/valkyrie/home/pod-rproxy/.config/systemd/user/pod-rproxy.service.j2 index 3580e3a..199cb14 100644 --- a/playbooks/filesystem/valkyrie/var/lib/valkyrie/home/pod-rproxy/.config/systemd/user/pod-rproxy.service.j2 +++ b/playbooks/filesystem/valkyrie/var/lib/valkyrie/home/pod-rproxy/.config/systemd/user/pod-rproxy.service.j2 @@ -10,7 +10,6 @@ Before=container-rproxy-nginx.service container-rproxy-certbot.timer Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStartPre=/bin/rm -f /var/lib/{{ ansible_hostname }}/containers/pod-rproxy/pidfile ExecStartPre=/bin/rm -f %t/pod-rproxy.pid %t/pod-rproxy.pod-id ExecStartPre=/usr/bin/podman pod create --infra-conmon-pidfile %t/pod-rproxy.pid --pod-id-file %t/pod-rproxy.pod-id --name=rproxy --network=none --replace ExecStart=/usr/bin/podman pod start --pod-id-file %t/pod-rproxy.pod-id diff --git a/playbooks/filesystem/valkyrie/var/lib/valkyrie/home/pod-www/.config/systemd/user/pod-www.service.j2 b/playbooks/filesystem/valkyrie/var/lib/valkyrie/home/pod-www/.config/systemd/user/pod-www.service.j2 index 4d28ef9..4d48af9 100644 --- a/playbooks/filesystem/valkyrie/var/lib/valkyrie/home/pod-www/.config/systemd/user/pod-www.service.j2 +++ b/playbooks/filesystem/valkyrie/var/lib/valkyrie/home/pod-www/.config/systemd/user/pod-www.service.j2 @@ -10,7 +10,6 @@ Before=container-www-nginx.service Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStartPre=/bin/rm -f /var/lib/{{ ansible_hostname }}/containers/pod-www/pidfile 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 ExecStart=/usr/bin/podman pod start --pod-id-file %t/pod-www.pod-id diff --git a/playbooks/filesystem/yggdrasil/var/lib/yggdrasil/home/pod-lrproxy/.config/systemd/user/pod-lrproxy.service.j2 b/playbooks/filesystem/yggdrasil/var/lib/yggdrasil/home/pod-lrproxy/.config/systemd/user/pod-lrproxy.service.j2 index 5c31bf9..61d0b0c 100644 --- a/playbooks/filesystem/yggdrasil/var/lib/yggdrasil/home/pod-lrproxy/.config/systemd/user/pod-lrproxy.service.j2 +++ b/playbooks/filesystem/yggdrasil/var/lib/yggdrasil/home/pod-lrproxy/.config/systemd/user/pod-lrproxy.service.j2 @@ -10,7 +10,6 @@ Before=container-lrproxy-nginx.service rsync-certificates.timer Environment=PODMAN_SYSTEMD_UNIT=%n Restart=on-failure TimeoutStopSec=70 -ExecStartPre=/bin/rm -f /var/lib/{{ ansible_hostname }}/containers/pod-lrproxy/pidfile ExecStartPre=/bin/rm -f %t/pod-lrproxy.pid %t/pod-lrproxy.pod-id ExecStartPre=/usr/bin/podman pod create --infra-conmon-pidfile %t/pod-lrproxy.pid --pod-id-file %t/pod-lrproxy.pod-id --name=lrproxy --network=none --replace ExecStart=/usr/bin/podman pod start --pod-id-file %t/pod-lrproxy.pod-id