From 3d5581179544b8cbb534a0530743cfc42788c335 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 16 Dec 2019 20:24:41 +0100 Subject: [PATCH] mirrorlist: use correct path for cid and pid file Signed-off-by: Adrian Reber --- .../mirrorlist_proxy/templates/mirrorlist.service.j2 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 index cd56ab7021..3ea34e030c 100644 --- a/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 +++ b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 @@ -6,10 +6,10 @@ Restart=on-failure User=mirrormanager ExecStartPre=-/usr/bin/podman stop -t 1 %n ExecStartPre=-/usr/bin/podman rm %n --force -ExecStartPre=/usr/bin/rm -f /%t/%n-pid /%t/%n-cid +ExecStartPre=/usr/bin/rm -f /%t/run/{{ mirrormanager_uid }}/%n-pid /%t/run/{{ mirrormanager_uid }}/%n-cid ExecStart=/usr/bin/podman run \ - --conmon-pidfile /%t/%n-pid \ - --cidfile /%t/%n-cid \ + --conmon-pidfile /%t/run/{{ mirrormanager_uid }}/%n-pid \ + --cidfile /%t/run/{{ mirrormanager_uid }}/%n-cid \ --net=host --userns=keep-id \ --rm=true --name %n \ -v /usr/share/GeoIP:/usr/share/GeoIP \ @@ -23,10 +23,10 @@ ExecStart=/usr/bin/podman run \ --port 1808{{ item }} \ --listen 127.0.0.1 \ -l /var/log/mirrormanager/%n.log -ExecStop=/usr/bin/sh -c "/usr/bin/podman rm -f `cat /%t/%n-cid`" +ExecStop=/usr/bin/sh -c "/usr/bin/podman rm -f `cat /%t/run/{{ mirrormanager_uid }}/%n-cid`" KillMode=none Type=forking -PIDFile=/%t/%n-pid +PIDFile=/%t/run/{{ mirrormanager_uid }}/%n-pid [Install] WantedBy=multi-user.target