Debian packaging: Fix syntax error in varnishlog init script, and set correct variabl...

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2586 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/debian/varnish.default b/varnish-cache/debian/varnish.default
index 691649827e40d4877803a022a182b1361048b13f..def42991d38e689473a7be6231c1ff7d7fbc1fa1 100644 (file)
--- a/varnish-cache/debian/varnish.default
+++ b/varnish-cache/debian/varnish.default
@@ -17,8 +17,9 @@ MEMLOCK=82000
 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.
 

diff --git a/varnish-cache/debian/varnish.varnishlog.init b/varnish-cache/debian/varnish.varnishlog.init
index ba02a63061f7a3e4175c6f0656ffb189afcbcc87..7558c5c91a078bacf88b971e0ffcbd97aea3a85b 100755 (executable)
--- a/varnish-cache/debian/varnish.varnishlog.init
+++ b/varnish-cache/debian/varnish.varnishlog.init
@@ -27,8 +27,9 @@ if [ -f /etc/default/varnish ] ; then
         . /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