packages: varnish/varnishncsa.init, varnish/varnishncsa.sysconfig - support...

[glen]

Author: glen                         Date: Mon Jul 20 14:03:52 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- support disabling of logging

---- Files affected:
packages/varnish:
   varnishncsa.init (1.3 -> 1.4) , varnishncsa.sysconfig (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/varnish/varnishncsa.init
diff -u packages/varnish/varnishncsa.init:1.3 packages/varnish/varnishncsa.init:1.4
--- packages/varnish/varnishncsa.init:1.3	Mon Jul 20 16:00:04 2009
+++ packages/varnish/varnishncsa.init	Mon Jul 20 16:03:47 2009
@@ -27,12 +27,17 @@
 		return
 	fi
 
+	# NCSA log format, to be used by HTTP log analyzers
+	if ! is_yes "$VARNISHNCSA_ENABLED"; then
+		return
+	fi
+
 	local opts
-	if is_yes "${LOG_BACKEND}"; then
+	if is_yes "$LOG_BACKEND"; then
 		opts="$opts -b"
 	fi
 
-	if is_yes "${LOG_CLIENT}"; then
+	if is_yes "$LOG_CLIENT"; then
 		opts="$opts -c"
 	fi
 

================================================================
Index: packages/varnish/varnishncsa.sysconfig
diff -u packages/varnish/varnishncsa.sysconfig:1.2 packages/varnish/varnishncsa.sysconfig:1.3
--- packages/varnish/varnishncsa.sysconfig:1.2	Mon Jul 20 15:56:24 2009
+++ packages/varnish/varnishncsa.sysconfig	Mon Jul 20 16:03:47 2009
@@ -4,7 +4,7 @@
 # enough disk space for significant amounts of log data.
 #
 # NCSA log format, to be used by HTTP log analyzers
-#VARNISHNCSA_ENABLED=yes
+VARNISHNCSA_ENABLED=yes
 
 # Include log entries which result from communication with a backend server.
 LOG_BACKEND=no
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/varnishncsa.init?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/varnishncsa.sysconfig?r1=1.2&r2=1.3&f=u