r2587 - in branches/1.2: . debian

[ssm at projects.linpro.no]

Author: ssm
Date: 2008-03-10 08:51:56 +0100 (Mon, 10 Mar 2008)
New Revision: 2587

Modified:
   branches/1.2/
   branches/1.2/debian/varnish.default
   branches/1.2/debian/varnish.varnishlog.init
Log:
Merged revisions 2586 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2586 | ssm | 2008-03-10 08:46:37 +0100 (Mon, 10 Mar 2008) | 1 line
  
  Debian packaging: Fix syntax error in varnishlog init script, and set correct variable in defaults file. Add clarifying comment for variable
........



Property changes on: branches/1.2
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246-2255,2270-2271,2288-2291,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317-2319,2321-2327,2329-2330,2337,2357-2359,2361-2364,2366,2374-2382,2384-2386,2404,2414-2415,2426,2432-2434,2444-2445,2453-2461,2467,2492-2505,2520-2524,2545,2563-2579,2581-2583
   + /trunk/varnish-cache:1-2101,2104-2107,2115-2120,2122-2130,2133,2151,2153-2154,2157,2161-2162,2166-2168,2173,2175-2176,2180-2184,2186-2193,2206,2208,2210-2215,2220,2222-2232,2243,2246-2255,2270-2271,2288-2291,2296-2297,2299,2304-2305,2307-2309,2311-2312,2315,2317-2319,2321-2327,2329-2330,2337,2357-2359,2361-2364,2366,2374-2382,2384-2386,2404,2414-2415,2426,2432-2434,2444-2445,2453-2461,2467,2492-2505,2520-2524,2545,2563-2579,2581-2583,2586

Modified: branches/1.2/debian/varnish.default
===================================================================
--- branches/1.2/debian/varnish.default	2008-03-10 07:46:37 UTC (rev 2586)
+++ branches/1.2/debian/varnish.default	2008-03-10 07:51:56 UTC (rev 2587)
@@ -12,8 +12,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: branches/1.2/debian/varnish.varnishlog.init
===================================================================
--- branches/1.2/debian/varnish.varnishlog.init	2008-03-10 07:46:37 UTC (rev 2586)
+++ branches/1.2/debian/varnish.varnishlog.init	2008-03-10 07:51:56 UTC (rev 2587)
@@ -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