r2520 - trunk/varnish-cache/debian

[ssm at projects.linpro.no]

Author: ssm
Date: 2008-02-20 13:02:07 +0100 (Wed, 20 Feb 2008)
New Revision: 2520

Modified:
   trunk/varnish-cache/debian/varnish.default
   trunk/varnish-cache/debian/varnish.varnishlog.init
Log:
Debian packaging: Disable running of varnishlog by default

Modified: trunk/varnish-cache/debian/varnish.default
===================================================================
--- trunk/varnish-cache/debian/varnish.default	2008-02-20 10:59:25 UTC (rev 2519)
+++ trunk/varnish-cache/debian/varnish.default	2008-02-20 12:02:07 UTC (rev 2520)
@@ -11,6 +11,10 @@
 # the -n switch, to have more instances on a single server.
 INSTANCE=$(uname -n)
 
+# Uncomment this to enable varnishlog.  Please sure you have enough disk space
+# for significant amounts of log data.
+# VARNISHLOG_ENABLE=1
+
 # This file contains 4 alternatives, please use only one.
 
 ## Alternative 1, Minimal configuration, no VCL

Modified: trunk/varnish-cache/debian/varnish.varnishlog.init
===================================================================
--- trunk/varnish-cache/debian/varnish.varnishlog.init	2008-02-20 10:59:25 UTC (rev 2519)
+++ trunk/varnish-cache/debian/varnish.varnishlog.init	2008-02-20 12:02:07 UTC (rev 2520)
@@ -22,6 +22,16 @@
 PIDFILE=/var/run/$NAME.pid
 LOGFILE=/var/log/varnish/varnish.log
 
+# Include varnish defaults if available
+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
+  exit 0;
+fi
+
 test -x $DAEMON || exit 0
 
 DAEMON_OPTS="-a -w ${LOGFILE} -D -P $PIDFILE"