SOURCES: varnish.init, varnish.sysconfig - bring up to date

[glen]

Author: glen                         Date: Mon Jul  2 16:50:22 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- bring up to date

---- Files affected:
SOURCES:
   varnish.init (1.2 -> 1.3) , varnish.sysconfig (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/varnish.init
diff -u SOURCES/varnish.init:1.2 SOURCES/varnish.init:1.3
--- SOURCES/varnish.init:1.2	Mon Jul  2 13:41:30 2007
+++ SOURCES/varnish.init	Mon Jul  2 18:50:17 2007
@@ -11,24 +11,16 @@
 # Source function library.
 . /etc/init.d/functions
 
-PROCNAME=varnishd
-
 . /etc/sysconfig/varnish
-if [ "$DAEMON" = "" ]; then DAEMON="/usr/sbin/varnishd"; fi
-DAEMON_OPTS="-a ${VARNISH_LISTEN_ADDRESS}:${VARNISH_LISTEN_PORT} \
-		-h ${VARNISH_HASHOPTION} \
-		-f ${VARNISH_VCL_CONF} \
-		-T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \
-		-t ${VARNISH_TTL} \
-		-w ${VARNISH_MIN_WORKER_THREADS},${VARNISH_MAX_WORKER_THREADS},${VARNISH_WORKER_THREAD_TIMEOUT} \
-		-s ${VARNISH_BACKEND_STORAGE}"	
+
+if [ -z "$DAEMON" ]; then
+	DAEMON=/usr/sbin/varnishd
+fi
 
 start() {
 	if [ ! -f /var/lock/subsys/varnishd ]; then
 		msg_starting "Varnish HTTP accelerator"
 		daemon $DAEMON "$DAEMON_OPTS"
-		sleep 1
-		pkill -0 $PROCNAME
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/varnishd
 	else
@@ -56,7 +48,7 @@
   	stop
 	;;
   status)
-	status $PROCNAME
+	status varnishd
 	RETVAL=$?
 	;;
   restart|reload)

================================================================
Index: SOURCES/varnish.sysconfig
diff -u SOURCES/varnish.sysconfig:1.2 SOURCES/varnish.sysconfig:1.3
--- SOURCES/varnish.sysconfig:1.2	Mon Jul  2 13:51:46 2007
+++ SOURCES/varnish.sysconfig	Mon Jul  2 18:50:17 2007
@@ -5,7 +5,8 @@
 #
 
 # Maximum number of open files (for ulimit -n)
-NFILES=131072
+# Open files (usually 1024, which is way too small for varnish)
+SERVICE_LIMITS="-n 131072"
 
 # This file contains 4 alternatives, please use only one.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/varnish.init?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/varnish.sysconfig?r1=1.2&r2=1.3&f=u