From 61a907cb0388aabff134689e11d866a238baea49 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 17 Dec 2019 18:06:17 +0100 Subject: [PATCH] Revert "mirrorlist: second try to rework unit file" This reverts commit 98a36251d86f0336e4affca521aa4e70aa894b92. --- .../mirrorlist_proxy/templates/mirrorlist.service.j2 | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 index c6dd8c5228..fff8ca997a 100644 --- a/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 +++ b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 @@ -4,13 +4,11 @@ Description=Mirrorlist Container {{ item }} [Service] User=mirrormanager ExecStartPre=-/usr/bin/podman stop -t 1 %n -ExecStartPre=-/usr/bin/sh -c "/usr/bin/podman rm -f `cat %t/user/{{ mirrormanager_uid }}/%n-cid`" -ExecStartPre=/usr/bin/rm -f %t/user/{{ mirrormanager_uid }}/%n-pid %t/user/{{ mirrormanager_uid }}/%n-cid +ExecStartPre=-/usr/bin/podman rm %n --force ExecStart=/usr/bin/podman run \ - --conmon-pidfile %t/user/{{ mirrormanager_uid }}/%n-pid \ - --cidfile %t/user/{{ mirrormanager_uid }}/%n-cid \ + --rm=true \ --net=host --userns=keep-id \ - --rm=true --name %n -d \ + --rm=true --name %n \ -v /usr/share/GeoIP:/usr/share/GeoIP \ -v /srv/mirrorlist/data/mirrorlist{{ item }}:/var/lib/mirrormanager \ -v /var/log/mirrormanager:/var/log/mirrormanager \ @@ -22,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/user/{{ mirrormanager_uid }}/%n-cid`" +ExecStop=/usr/bin/podman stop -t 1 %n KillMode=none -Type=forking -PIDFile=%t/user/{{ mirrormanager_uid }}/%n-pid [Install] WantedBy=multi-user.target