Patch updated: clean up stale pid file when service stopped
diff --git a/debian/changelog b/debian/changelog
index b00da4c..8702738 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+privoxy (3.0.21-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * When starting via systemd, do not run daemon as root, and honour
+    log file configuration.
+
+ -- Carlos Maddela <madd...@labyrinth.net.au>  Sun, 20 Apr 2014 10:35:11 +1000
+
 privoxy (3.0.21-2) unstable; urgency=low
 
   * Use autotools-dev for arm64 compatibility (Closes: #727948).
diff --git a/debian/privoxy.service b/debian/privoxy.service
index 58f285d..7a48ffc 100644
--- a/debian/privoxy.service
+++ b/debian/privoxy.service
@@ -1,10 +1,14 @@
 [Unit]
 Description=Privacy enhancing HTTP Proxy
- 
+
 [Service]
-ExecStart=/usr/sbin/privoxy --no-daemon /etc/privoxy/config
-StandardOutput=syslog
-StandardError=syslog
+Environment=PIDFILE=/var/run/privoxy.pid
+Environment=OWNER=privoxy
+Environment=CONFIGFILE=/etc/privoxy/config
+Type=forking
+PIDFile=$PIDFILE
+ExecStart=/usr/sbin/privoxy --pidfile $PIDFILE --user $OWNER $CONFIGFILE
+ExecStopPost=/bin/rm -f $PIDFILE
 
 [Install]
 WantedBy=multi-user.target

Reply via email to