updates-proxy: use separate directory for PID file
And also use systemd-tmpfiles for that directory creation.
Fixes QubesOS/qubes-issues#1401
(cherry picked from commit 2a589f2c20
)
Conflicts:
Makefile
rpm_spec/core-vm.spec
This commit is contained in:
parent
1e2e9706b7
commit
689db404e8
2
Makefile
2
Makefile
|
@ -84,6 +84,8 @@ install-systemd:
|
|||
install -m 0644 vm-systemd/75-qubes-vm.preset $(DESTDIR)$(SYSLIBDIR)/systemd/system-preset/
|
||||
install -m 0644 vm-systemd/qubes-core.conf $(DESTDIR)$(SYSLIBDIR)/modules-load.d/
|
||||
install -m 0644 vm-systemd/qubes-misc.conf $(DESTDIR)$(SYSLIBDIR)/modules-load.d/
|
||||
install -D -m 0644 vm-systemd/qubes-core-agent-linux.tmpfiles \
|
||||
$(DESTDIR)/usr/lib/tmpfiles.d/qubes-core-agent-linux.conf
|
||||
|
||||
install-sysvinit:
|
||||
install -d $(DESTDIR)/etc/init.d
|
||||
|
|
|
@ -8,7 +8,7 @@ DefaultErrorFile "/usr/share/tinyproxy/default.html"
|
|||
StatFile "/usr/share/tinyproxy/stats.html"
|
||||
Syslog On
|
||||
LogLevel Notice
|
||||
PidFile "/var/run/tinyproxy/tinyproxy-updates.pid"
|
||||
PidFile "/var/run/tinyproxy-updates/tinyproxy.pid"
|
||||
|
||||
MaxClients 50
|
||||
MinSpareServers 2
|
||||
|
|
|
@ -573,6 +573,7 @@ The Qubes core startup configuration for SystemD init.
|
|||
/lib/systemd/system/NetworkManager-wait-online.service.d/30_qubes.conf
|
||||
/lib/systemd/system/ntpd.service.d/30_qubes.conf
|
||||
/lib/systemd/system/tmp.mount.d/30_qubes.conf
|
||||
/usr/lib/tmpfiles.d/qubes-core-agent-linux.conf
|
||||
|
||||
%post systemd
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
exec="/usr/sbin/tinyproxy"
|
||||
prog=$(basename $exec)
|
||||
config="/etc/tinyproxy/tinyproxy-updates.conf"
|
||||
pidfile="/var/run/tinyproxy/tinyproxy-updates.pid"
|
||||
pidfile="/var/run/tinyproxy-updates/tinyproxy.pid"
|
||||
|
||||
[ -e /etc/sysconfig/tinyproxy-updates ] && . /etc/sysconfig/tinyproxy-updates
|
||||
|
||||
|
|
1
vm-systemd/qubes-core-agent-linux.tmpfiles
Normal file
1
vm-systemd/qubes-core-agent-linux.tmpfiles
Normal file
|
@ -0,0 +1 @@
|
|||
d /var/run/tinyproxy-updates 0755 tinyproxy tinyproxy
|
|
@ -5,7 +5,6 @@ ConditionPathExists=|/var/run/qubes-service/qubes-updates-proxy
|
|||
After=iptables.service
|
||||
|
||||
[Service]
|
||||
ExecStartPre=/usr/bin/install -d --owner tinyproxy --group tinyproxy /var/run/tinyproxy
|
||||
ExecStartPre=/usr/lib/qubes/iptables-updates-proxy start
|
||||
ExecStart=/usr/sbin/tinyproxy -d -c /etc/tinyproxy/tinyproxy-updates.conf
|
||||
ExecStopPost=/usr/lib/qubes/iptables-updates-proxy stop
|
||||
|
|
Loading…
Reference in New Issue
Block a user