- support disabling of logging

Changed files:
    varnishncsa.init -> 1.4
    varnishncsa.sysconfig -> 1.3

diff --git a/varnishncsa.init b/varnishncsa.init
index 76582c38f209777d9f37af97f65f664232270f30..479dc00f910de65008ce72a61403ed8ebc18967f 100644 (file)
--- a/varnishncsa.init
+++ b/varnishncsa.init
@@ -27,12 +27,17 @@ start() {
                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
 

diff --git a/varnishncsa.sysconfig b/varnishncsa.sysconfig
index 47f7b784f5d2786c5db9dc908d96991491ec31da..341dd3c660e9021433335f26f966df11733be29a 100644 (file)
--- a/varnishncsa.sysconfig
+++ b/varnishncsa.sysconfig
@@ -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