PR#202 run-time check and related issues

squid/fsl.squid

@@ -9,7 +9,7 @@ ident (squid)/.+ q{
     -> {
         debug: file(
             path="@l_prefix@/var/squid/logs/squid.log",
-            perm=0644
+            perm=0644, jitter=1
         )
     }
 };

squid/rc.squid

@@ -22,17 +22,20 @@
 
 %start -u @l_susr@
     rcService squid enable yes || exit 0
+    rcService squid active yes && exit 0
     @l_prefix@/sbin/squid -D -s
+    sleep 2
 
 %stop -u @l_susr@
     rcService squid enable yes || exit 0
+    rcService squid active no  && exit 0
     @l_prefix@/sbin/squid -k shutdown
+    sleep 2
 
 %restart -u @l_susr@
     rcService squid enable yes || exit 0
-    @l_prefix@/sbin/squid -k shutdown
-    sleep 1
-    @l_prefix@/sbin/squid -D -s
+    rcService squid active no  && exit 0
+    rc squid stop start
 
 %reload -u @l_susr@
     rcService squid enable yes || exit 0
@@ -40,10 +43,12 @@
 
 %daily -u @l_susr@
     rcService squid enable yes || exit 0
+
+    #   rotate logfile
     @l_prefix@/sbin/squid -k rotate
     shtool rotate -f \
         -n ${squid_log_numfiles} -s ${squid_log_minsize} -d \
-        -z ${squid_log_complevel} -o @l_rusr@ -g @l_rgrp@ -m 644 \
+        -z ${squid_log_complevel} -m 644 -o @l_susr@ -g @l_mgrp@ \
         -P "${squid_log_prolog}" \
         -E "${squid_log_epilog}" \
         @l_prefix@/var/squid/logs/squid.log

squid/squid.spec

@@ -38,7 +38,7 @@ Distribution: OpenPKG [BASE]
 Group:        Web
 License:      GPL
 Version:      %{V_maj}.%{V_min}.%{V_rev}
-Release:      20030722
+Release:      20030723
 
 #   package options
 %option       with_fsl   yes
@@ -142,6 +142,7 @@ AutoReqProv:  no
         -e 's;^# \(cache_mgr\).*;\1 %{l_musr};' \
         -e 's;^# \(cache_effective_user\).*;\1 %{l_rusr};' \
         -e 's;^# \(cache_effective_group\).*;\1 %{l_rgrp};' \
+        -e 's;^# \(http_port\).*;\1 127.0.0.1:3128;' \
         $RPM_BUILD_ROOT%{l_prefix}/etc/squid/squid.conf
 
     #   install run-command script
@@ -181,10 +182,17 @@ AutoReqProv:  no
         $RPM_INSTALL_PREFIX/sbin/squid -z >/dev/null 2>&1
     fi
 
+    #   after upgrade, restart service
+    [ $1 -eq 2 ] || exit 0
+    eval `%{l_rc} squid status 2>/dev/null`
+    [ ".$squid_active" = .yes ] && %{l_rc} squid restart
+    exit 0
+
 %preun
-    if [ $1 -eq 0 ]; then
-        #   remove cache directory structure (including contents) and logfiles
-        rm -rf $RPM_INSTALL_PREFIX/var/squid/cache/[0-9ABCDEF][0-9ABCDEF] >/dev/null 2>&1 || true
-        rm -rf $RPM_INSTALL_PREFIX/var/squid/logs/* >/dev/null 2>&1 || true
-    fi
+    #   before erase, stop service and remove log files
+    [ $1 -eq 0 ] || exit 0
+    %{l_rc} squid stop 2>/dev/null
+    rm -rf $RPM_INSTALL_PREFIX/var/squid/cache/[0-9ABCDEF][0-9ABCDEF] >/dev/null 2>&1 || true
+    rm -rf $RPM_INSTALL_PREFIX/var/squid/logs/* >/dev/null 2>&1 || true
+    exit 0