r2523 - in branches/1.1: . debian

[ssm at projects.linpro.no]

Author: ssm
Date: 2008-02-20 14:58:33 +0100 (Wed, 20 Feb 2008)
New Revision: 2523

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

........
  r2520 | ssm | 2008-02-20 13:02:07 +0100 (Wed, 20 Feb 2008) | 1 line
  
  Debian packaging: Disable running of varnishlog by default
........
  r2521 | ssm | 2008-02-20 14:39:59 +0100 (Wed, 20 Feb 2008) | 1 line
  
  Typo patrol
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2288-2291,2295-2301,2304-2327,2357-2359,2361-2364,2366,2374-2381,2383-2386,2414-2415,2421-2422,2426,2432-2434,2444-2445,2447,2457,2492-2494,2500-2502
   + /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888-1889,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2057,2077-2080,2086,2088,2097,2106-2107,2116,2133,2154,2173,2181,2206-2207,2211-2212,2215-2245,2256-2262,2270-2271,2275,2285-2286,2288-2291,2295-2301,2304-2327,2357-2359,2361-2364,2366,2374-2381,2383-2386,2414-2415,2421-2422,2426,2432-2434,2444-2445,2447,2457,2492-2494,2500-2502,2520-2521

Modified: branches/1.1/debian/varnish.default
===================================================================
--- branches/1.1/debian/varnish.default	2008-02-20 13:56:36 UTC (rev 2522)
+++ branches/1.1/debian/varnish.default	2008-02-20 13:58:33 UTC (rev 2523)
@@ -11,6 +11,10 @@
 # the -n switch, to have more instances on a single server.
 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
+
 # This file contains 4 alternatives, please use only one.
 
 ## Alternative 1, Minimal configuration, no VCL

Modified: branches/1.1/debian/varnish.varnishlog.init
===================================================================
--- branches/1.1/debian/varnish.varnishlog.init	2008-02-20 13:56:36 UTC (rev 2522)
+++ branches/1.1/debian/varnish.varnishlog.init	2008-02-20 13:58:33 UTC (rev 2523)
@@ -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"