Revert "mirrorlist: use correct path for cid and pid file"

This reverts commit 43d3cc1523a53a094ca765aee8c754d406673ffc.
This commit is contained in:
Adrian Reber 2019-12-16 20:53:28 +01:00 committed by Pierre-Yves Chibon
parent 11c8cae9e7
commit ad8c451629

View file

@ -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/run/{{ mirrormanager_uid }}/%n-pid /%t/run/{{ mirrormanager_uid }}/%n-cid
ExecStartPre=/usr/bin/rm -f /%t/%n-pid /%t/%n-cid
ExecStart=/usr/bin/podman run \
--conmon-pidfile /%t/run/{{ mirrormanager_uid }}/%n-pid \
--cidfile /%t/run/{{ mirrormanager_uid }}/%n-cid \
--conmon-pidfile /%t/%n-pid \
--cidfile /%t/%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/run/{{ mirrormanager_uid }}/%n-cid`"
ExecStop=/usr/bin/sh -c "/usr/bin/podman rm -f `cat /%t/%n-cid`"
KillMode=none
Type=forking
PIDFile=/%t/run/{{ mirrormanager_uid }}/%n-pid
PIDFile=/%t/%n-pid
[Install]
WantedBy=multi-user.target