This is more pre-2.0 than 1.1.2+

git-svn-id: svn+ssh://projects.linpro.no/svn/varnish/trunk@2562 d4fa192b-c00b-0410-8231-f00ffab90ce4

diff --git a/varnish-cache/redhat/varnish.initrc b/varnish-cache/redhat/varnish.initrc
index c287552be554771afb9dc47ffcf931a5416f6afc..8d3825b3623285082bbef640a1b3f70c16f36c52 100755 (executable)
--- a/varnish-cache/redhat/varnish.initrc
+++ b/varnish-cache/redhat/varnish.initrc
@@ -26,6 +26,9 @@ mkdir -p /var/run/varnish 2>/dev/null
 # Open files (usually 1024, which is way too small for varnish)
 ulimit -n ${NFILES:-131072}
 
+# Varnish wants to lock shared memory log in memory. 
+ulimit -l ${MEMLOCK:-82000}
+
 # See how we were called.
 case "$1" in
   start)

diff --git a/varnish-cache/redhat/varnish.spec b/varnish-cache/redhat/varnish.spec
index 26a6141a6536297355b16e13cf4da49ef98221cc..5c306eb565037554322cb1184928f47878af2774 100644 (file)
--- a/varnish-cache/redhat/varnish.spec
+++ b/varnish-cache/redhat/varnish.spec
@@ -1,7 +1,7 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
-Version: 1.1.2
-Release: 5%{?dist}
+Version: 2.0
+Release: pre_svn20080307%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/

diff --git a/varnish-cache/redhat/varnish.sysconfig b/varnish-cache/redhat/varnish.sysconfig
index 56dffb7f3ef258ffe56d46970ccd3b4f7ff20d69..aa1a6f3a8fe3aad4623bd20e8ea3fcd055bd804e 100644 (file)
--- a/varnish-cache/redhat/varnish.sysconfig
+++ b/varnish-cache/redhat/varnish.sysconfig
@@ -7,6 +7,10 @@
 # Maximum number of open files (for ulimit -n)
 NFILES=131072
 
+# Locked shared memory (for ulimit -l)
+# Default log size is 82MB + header
+MEMLOCK=82000
+
 # This file contains 4 alternatives, please use only one.
 
 ## Alternative 1, Minimal configuration, no VCL