r2580 - trunk/varnish-cache/debian

[ssm at projects.linpro.no]

Author: ssm
Date: 2008-03-10 07:02:00 +0100 (Mon, 10 Mar 2008)
New Revision: 2580

Modified:
   trunk/varnish-cache/debian/varnish.default
   trunk/varnish-cache/debian/varnish.init
Log:
Debian packaging: Allow adjustment of maximum locked memory size

Modified: trunk/varnish-cache/debian/varnish.default
===================================================================
--- trunk/varnish-cache/debian/varnish.default	2008-03-09 15:26:55 UTC (rev 2579)
+++ trunk/varnish-cache/debian/varnish.default	2008-03-10 06:02:00 UTC (rev 2580)
@@ -7,6 +7,11 @@
 # Maximum number of open files (for ulimit -n)
 NFILES=131072
 
+# Maximum locked memory size (for ulimit -l)
+# Used for locking the shared memory log in memory.  If you increase log size,
+# you need to increase this number as well
+MEMLOCK=82000
+
 # Default varnish instance name is the local nodename.  Can be overridden with
 # the -n switch, to have more instances on a single server.
 INSTANCE=$(uname -n)

Modified: trunk/varnish-cache/debian/varnish.init
===================================================================
--- trunk/varnish-cache/debian/varnish.init	2008-03-09 15:26:55 UTC (rev 2579)
+++ trunk/varnish-cache/debian/varnish.init	2008-03-10 06:02:00 UTC (rev 2580)
@@ -34,6 +34,9 @@
 # Open files (usually 1024, which is way too small for varnish)
 ulimit -n ${NFILES:-131072}
 
+# Maxiumum locked memory size for shared memory log
+ulimit -l ${MEMLOCK:-82000}
+
 # 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.)