Revert "mirrorlist: second try to rework unit file"

This reverts commit 98a36251d86f0336e4affca521aa4e70aa894b92.
This commit is contained in:
Adrian Reber 2019-12-17 18:06:17 +01:00 committed by Pierre-Yves Chibon
parent bb95189281
commit 61a907cb03

View file

@ -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