X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=privoxy-generic.init;h=d13e1d79c309e5eaef03d592ad968571e828344b;hp=dbf220364555f99eef83b4c728f1bbcae7886493;hb=d402fcdeef246e2e126755f613f1e42d999cc9e1;hpb=179bd487cc4bd8eea79432dc5c03544591235976 diff --git a/privoxy-generic.init b/privoxy-generic.init index dbf22036..d13e1d79 100755 --- a/privoxy-generic.init +++ b/privoxy-generic.init @@ -39,6 +39,9 @@ # # Revisions : # $Log: privoxy-generic.init,v $ +# Revision 1.4 2002/09/11 01:15:02 hal9 +# Fix typo in variable. Now tested on Solaris and Linux, with defaults. +# # Revision 1.3 2002/09/11 01:09:14 hal9 # Better handling of pidfile, and process owner. # @@ -70,10 +73,10 @@ P_NAME=Privoxy # Path to executable. P_DAEMON=privoxy # Full path to location of Privoxy config file. -P_CONF_FILE=./config +P_CONF_FILE=/usr/local/etc/privoxy/config # Full path to PID file location. Location must be writable by # whoever runs this script. -P_PIDFILE=`pwd`/privoxy.pid +P_PIDFILE=/var/run/privoxy.pid # If uncommented, this script will try to run as USER=privoxy, which # may require special handling of config, *.action, trust, logfile, # jarfile, and pidfile. @@ -121,7 +124,7 @@ case "$1" in stop) test ! -f $P_PIDFILE && echo "No $P_PIDFILE file found, exiting." && exit 1 - kill `cat $P_PIDFILE` &&\ + kill `cat $P_PIDFILE` && rm -f $P_PIDFILE && \ echo "Stopping $P_NAME, OK." || echo "Stopping $P_NAME, failed." ;;