From 4b588f620c871bb9aecdc3e1b4ca2e0e0b1ce6fb Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 16 Dec 2019 20:53:31 +0100 Subject: [PATCH] Revert "mirrorlist: adapt service file based on official recommendation" This reverts commit 96904b2c5bf5a2cee1cacd877911740954f4b245. --- .../mirrorlist_proxy/templates/mirrorlist.service.j2 | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 index cd56ab7021..fff8ca997a 100644 --- a/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 +++ b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 @@ -2,14 +2,11 @@ Description=Mirrorlist Container {{ item }} [Service] -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 ExecStart=/usr/bin/podman run \ - --conmon-pidfile /%t/%n-pid \ - --cidfile /%t/%n-cid \ + --rm=true \ --net=host --userns=keep-id \ --rm=true --name %n \ -v /usr/share/GeoIP:/usr/share/GeoIP \ @@ -23,10 +20,8 @@ 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/podman stop -t 1 %n KillMode=none -Type=forking -PIDFile=/%t/%n-pid [Install] WantedBy=multi-user.target