From ace91e0f9fb55539353b6d1c0d9fbc89bb81ed69 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 17 Dec 2019 15:35:11 +0100 Subject: [PATCH] mirrorlist: second try to rework unit file Still based on https://www.redhat.com/sysadmin/podman-shareable-systemd-services Signed-off-by: Adrian Reber --- .../mirrorlist_proxy/templates/mirrorlist.service.j2 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 index fff8ca997a..c6dd8c5228 100644 --- a/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 +++ b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 @@ -4,11 +4,13 @@ Description=Mirrorlist Container {{ item }} [Service] User=mirrormanager ExecStartPre=-/usr/bin/podman stop -t 1 %n -ExecStartPre=-/usr/bin/podman rm %n --force +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 ExecStart=/usr/bin/podman run \ - --rm=true \ + --conmon-pidfile %t/user/{{ mirrormanager_uid }}/%n-pid \ + --cidfile %t/user/{{ mirrormanager_uid }}/%n-cid \ --net=host --userns=keep-id \ - --rm=true --name %n \ + --rm=true --name %n -d \ -v /usr/share/GeoIP:/usr/share/GeoIP \ -v /srv/mirrorlist/data/mirrorlist{{ item }}:/var/lib/mirrormanager \ -v /var/log/mirrormanager:/var/log/mirrormanager \ @@ -20,8 +22,10 @@ ExecStart=/usr/bin/podman run \ --port 1808{{ item }} \ --listen 127.0.0.1 \ -l /var/log/mirrormanager/%n.log -ExecStop=/usr/bin/podman stop -t 1 %n +ExecStop=/usr/bin/sh -c "/usr/bin/podman rm -f `cat %t/user/{{ mirrormanager_uid }}/%n-cid`" KillMode=none +Type=forking +PIDFile=%t/user/{{ mirrormanager_uid }}/%n-pid [Install] WantedBy=multi-user.target