Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use exec to ease systemd handling the tinyproxy process

Browse Source 
From Marek's comments
This commit is contained in:
Frédéric Pierret (fepitre) 2019-04-17 11:37:03 +02:00
parent 0fd8da62b6
commit 94dad3640c
No known key found for this signature in database
GPG Key ID: 484010B5CDC576E2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
misc/tinyproxy-wrapper
View File

@ -2,10 +2,10 @@
if [ -e /usr/sbin/tinyproxy ]; then if [ -e /usr/sbin/tinyproxy ]; then
echo "Found tinyproxy at /usr/sbin/tinyproxy" echo "Found tinyproxy at /usr/sbin/tinyproxy"
/usr/sbin/tinyproxy "$@" exec /usr/sbin/tinyproxy "$@"
elif [ -e /usr/bin/tinyproxy ]; then elif [ -e /usr/bin/tinyproxy ]; then
echo "Found tinyproxy at /usr/bin/tinyproxy" echo "Found tinyproxy at /usr/bin/tinyproxy"
/usr/bin/tinyproxy "$@" exec /usr/bin/tinyproxy "$@"
else else
echo "tinyproxy not found" echo "tinyproxy not found"
exit 1 exit 1

2
vm-systemd/qubes-updates-proxy.service
View File

@ -5,7 +5,7 @@ After=qubes-iptables.service
[Service] [Service]
ExecStartPre=/usr/lib/qubes/iptables-updates-proxy start ExecStartPre=/usr/lib/qubes/iptables-updates-proxy start
ExecStart=/bin/bash -c '/usr/lib/qubes/tinyproxy-wrapper -d -c /etc/tinyproxy/tinyproxy-updates.conf' ExecStart=/usr/lib/qubes/tinyproxy-wrapper -d -c /etc/tinyproxy/tinyproxy-updates.conf
ExecStopPost=/usr/lib/qubes/iptables-updates-proxy stop ExecStopPost=/usr/lib/qubes/iptables-updates-proxy stop
Restart=on-failure Restart=on-failure
RestartSec=5s RestartSec=5s