SF.net SVN: gar:[25642] csw/mgar/pkg/squid/trunk/files/cswsquid3

[dmichelsen at users.sourceforge.net]

Revision: 25642
          http://sourceforge.net/p/gar/code/25642
Author:   dmichelsen
Date:     2016-04-04 09:41:13 +0000 (Mon, 04 Apr 2016)
Log Message:
-----------
squid/trunk: Put pidfile in run/ as reported in #5270

Modified Paths:
--------------
    csw/mgar/pkg/squid/trunk/files/cswsquid3

Modified: csw/mgar/pkg/squid/trunk/files/cswsquid3
===================================================================
--- csw/mgar/pkg/squid/trunk/files/cswsquid3	2016-04-04 09:38:17 UTC (rev 25641)
+++ csw/mgar/pkg/squid/trunk/files/cswsquid3	2016-04-04 09:41:13 UTC (rev 25642)
@@ -7,7 +7,7 @@
 CSWSBIN=${CSWPREFIX}/sbin
 SQUID_DAEMON=${CSWSBIN}/squid
 SQUID_CONF=${CSWETC}/squid/squid.conf
-SQUID_PIDFILE=/var${CSWPREFIX}/squid/logs/squid.pid
+SQUID_PIDFILE=/var${CSWPREFIX}/squid/run/squid.pid
 
 if [ -f /lib/svc/share/smf_include.sh ]; then
     . /lib/svc/share/smf_include.sh
@@ -38,12 +38,12 @@
                 ## stop gracefully
                     echo 'stopping squid server... please wait for cleanup...'
                 ${SQUID_DAEMON} -k shutdown
-                rm -f /var/opt/csw/squid/logs/squid.pid
+                rm -f ${SQUID_PIDFILE}
                 exit 0
             else
                 ## Not running
                 echo 'squid server is already down'
-                rm -f /var/opt/csw/squid/logs/squid.pid
+                rm -f ${SQUID_PIDFILE}
                 exit 0
             fi
         else
@@ -51,7 +51,7 @@
             echo 'Squid server not properly installed'
             echo 'Forcing Down!'
             pkill -9 squid
-            rm -f /var/opt/csw/squid/logs/squid.pid
+            rm -f ${SQUID_PIDFILE}
             exit 1
             fi
         ;;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.