r2586 - trunk/varnish-cache/debian

[ssm at projects.linpro.no]

Author: ssm
Date: 2008-03-10 08:46:37 +0100 (Mon, 10 Mar 2008)
New Revision: 2586

Modified:
   trunk/varnish-cache/debian/varnish.default
   trunk/varnish-cache/debian/varnish.varnishlog.init
Log:
Debian packaging: Fix syntax error in varnishlog init script, and set correct variable in defaults file. Add clarifying comment for variable

Modified: trunk/varnish-cache/debian/varnish.default
===================================================================
--- trunk/varnish-cache/debian/varnish.default	2008-03-10 07:30:29 UTC (rev 2585)
+++ trunk/varnish-cache/debian/varnish.default	2008-03-10 07:46:37 UTC (rev 2586)
@@ -17,8 +17,9 @@
 INSTANCE=$(uname -n)
 
 # Uncomment this to enable varnishlog.  Please make sure you have
-# enough disk space for significant amounts of log data.
-# VARNISHLOG_ENABLE=1
+# enough disk space for significant amounts of log data.  To disable
+# varnishlog, set the variable to "0", "no", or leave it unset.
+# VARNISHLOG_ENABLED=1
 
 # This file contains 4 alternatives, please use only one.
 

Modified: trunk/varnish-cache/debian/varnish.varnishlog.init
===================================================================
--- trunk/varnish-cache/debian/varnish.varnishlog.init	2008-03-10 07:30:29 UTC (rev 2585)
+++ trunk/varnish-cache/debian/varnish.varnishlog.init	2008-03-10 07:46:37 UTC (rev 2586)
@@ -27,8 +27,9 @@
         . /etc/default/varnish
 fi
 
-# If unset or not 1, exit
-if [ -z "${VARNISHLOG_ENABLED}" -o "${VARNISHLOG_ENABLED}" -ne "1" ]; then
+# If unset, or set to "0" or "no", exit
+if [ -z "${VARNISHLOG_ENABLED}" -o "${VARNISHLOG_ENABLED}" == "0" \
+     -o "${VARNISHLOG_ENABLED}" == "no" ]; then
   exit 0;
 fi