r1457 - in branches/1.0: . debian

[des at projects.linpro.no]

Author: des
Date: 2007-05-20 18:21:19 +0200 (Sun, 20 May 2007)
New Revision: 1457

Added:
   branches/1.0/debian/varnish.varnishlog.init
Modified:
   branches/1.0/
   branches/1.0/debian/dirs
   branches/1.0/debian/rules
   branches/1.0/debian/varnish.default
   branches/1.0/debian/varnish.init
Log:
Merged revisions 1455-1456 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r1455 | ssm | 2007-05-18 16:14:53 +0200 (Fri, 18 May 2007) | 1 line
  
  Add init script for varnishlog
........
  r1456 | des | 2007-05-20 18:19:03 +0200 (Sun, 20 May 2007) | 2 lines
  
  Copy NFILES knob from redhat/varnish.initrc.
........



Property changes on: branches/1.0
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1315,1359-1387,1394,1399-1421,1424-1432,1434,1437-1445,1447-1451
   + /trunk/varnish-cache:1-1315,1359-1387,1394,1399-1421,1424-1432,1434,1437-1445,1447-1451,1455-1456

Modified: branches/1.0/debian/dirs
===================================================================
--- branches/1.0/debian/dirs	2007-05-20 16:19:03 UTC (rev 1456)
+++ branches/1.0/debian/dirs	2007-05-20 16:21:19 UTC (rev 1457)
@@ -3,5 +3,6 @@
 usr/lib
 usr/sbin
 var/log
+var/log/varnish
 var/lib/varnish
 usr/share/lintian/overrides/

Modified: branches/1.0/debian/rules
===================================================================
--- branches/1.0/debian/rules	2007-05-20 16:19:03 UTC (rev 1456)
+++ branches/1.0/debian/rules	2007-05-20 16:21:19 UTC (rev 1457)
@@ -83,6 +83,7 @@
 	dh_installdocs
 	# Since varnish loses its cache on restart - we don't.
 	dh_installinit -r
+	dh_installinit --name=varnishlog
 	dh_installman
 	dh_installexamples
 	dh_link

Modified: branches/1.0/debian/varnish.default
===================================================================
--- branches/1.0/debian/varnish.default	2007-05-20 16:19:03 UTC (rev 1456)
+++ branches/1.0/debian/varnish.default	2007-05-20 16:21:19 UTC (rev 1457)
@@ -4,6 +4,9 @@
 # shell script fragment.
 #
 
+# Maximum number of open files (for ulimit -n)
+NFILES=131072
+
 # This file contains 4 alternatives, please use only one.
 
 ## Alternative 1, Minimal configuration, no VCL

Modified: branches/1.0/debian/varnish.init
===================================================================
--- branches/1.0/debian/varnish.init	2007-05-20 16:19:03 UTC (rev 1456)
+++ branches/1.0/debian/varnish.init	2007-05-20 16:21:19 UTC (rev 1457)
@@ -31,6 +31,9 @@
         . /etc/default/varnish
 fi
 
+# Open files (usually 1024, which is way too small for varnish)
+ulimit -n ${NFILES:-131072}
+
 # If $DAEMON_OPTS is not set at all in /etc/default/varnish, use minimal useful
 # defaults (Backend at localhost:8080, a common place to put a locally
 # installed application server.)

Copied: branches/1.0/debian/varnish.varnishlog.init (from rev 1456, trunk/varnish-cache/debian/varnish.varnishlog.init)