[csw-devel] SF.net SVN: gar:[5309] csw/mgar/pkg/squid/trunk

[valholla at users.sourceforge.net]

Revision: 5309
          http://gar.svn.sourceforge.net/gar/?rev=5309&view=rev
Author:   valholla
Date:     2009-06-18 19:54:32 +0000 (Thu, 18 Jun 2009)

Log Message:
-----------
tweak postinstall

Modified Paths:
--------------
    csw/mgar/pkg/squid/trunk/checksums
    csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall
    csw/mgar/pkg/squid/trunk/files/cswsquid

Modified: csw/mgar/pkg/squid/trunk/checksums
===================================================================
--- csw/mgar/pkg/squid/trunk/checksums	2009-06-18 19:33:26 UTC (rev 5308)
+++ csw/mgar/pkg/squid/trunk/checksums	2009-06-18 19:54:32 UTC (rev 5309)
@@ -1,5 +1,5 @@
-444613c2b74dfca55ec2f96b58d44a09  download/CSWsquid.postinstall
+257a1bb82830125d2e63e5ff6103992f  download/CSWsquid.postinstall
 f97bf395c3d2d73a876f9091707126bc  download/CSWsquid.preremove
-7ef74ab82a2cfdcf60455159daaf542a  download/cswsquid
+ce286cf7f5b2bdc29525ebf1aa2c4dbf  download/cswsquid
 6de3a6a7a56a7ecae092f2d31a04f039  download/squid-2.7.STABLE6.tar.bz2
 2b6b3053a34a53e2e5e036edc2f0a74b  download/squid.conf.CSW

Modified: csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall
===================================================================
--- csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall	2009-06-18 19:33:26 UTC (rev 5308)
+++ csw/mgar/pkg/squid/trunk/files/CSWsquid.postinstall	2009-06-18 19:54:32 UTC (rev 5309)
@@ -23,10 +23,6 @@
     chmod 0644 ${SQUID_CONFDIR}/squid.conf
 fi
 
-touch ${SQUID_VARDIR}/logs/access.log
-touch ${SQUID_VARDIR}/logs/cache.log
-touch ${SQUID_VARDIR}/logs/store.log
-
 if [ "_x${USER}x_" = "_xx_" ]; then
     USER=nobody
 fi
@@ -34,9 +30,7 @@
     GRP=nobody
 fi
 
-chown ${USER}:${GRP} ${SQUID_VARDIR}/logs/access.log
-chown ${USER}:${GRP} ${SQUID_VARDIR}/logs/cache.log
-chown ${USER}:${GRP} ${SQUID_VARDIR}/logs/store.log
+chown ${USER}:${GRP} ${SQUID_VARDIR}/logs
 chown ${USER}:${GRP} ${SQUID_VARDIR}/cache
 
 ${SQUID_SBINDIR}/squid -z

Modified: csw/mgar/pkg/squid/trunk/files/cswsquid
===================================================================
--- csw/mgar/pkg/squid/trunk/files/cswsquid	2009-06-18 19:33:26 UTC (rev 5308)
+++ csw/mgar/pkg/squid/trunk/files/cswsquid	2009-06-18 19:54:32 UTC (rev 5309)
@@ -35,7 +35,8 @@
             if [ -n "`pgrep squid`" ]; then
                 ## stop gracefully
 	            echo 'stopping squid server... please wait for cleanup...'
-                ${SQUID_DAEMON} -k shutdown && sleep 30
+                ${SQUID_DAEMON} -k shutdown 
+                sleep 30
                 if [ -n "`pgrep squid`" ]; then
                     echo 'squid server still running, killing...'
                     pkill -9 squid


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