packages: varnish/varnish.init - cosmetics

[glen]

Author: glen                         Date: Fri Nov 20 12:22:55 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- cosmetics

---- Files affected:
packages/varnish:
   varnish.init (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/varnish/varnish.init
diff -u packages/varnish/varnish.init:1.7 packages/varnish/varnish.init:1.8
--- packages/varnish/varnish.init:1.7	Fri Nov 20 13:20:22 2009
+++ packages/varnish/varnish.init	Fri Nov 20 13:22:49 2009
@@ -27,25 +27,25 @@
 	exit 0
 fi
 
-# DAEMON_OPTS is used by the init script.  If you add or remove options, make
-# sure you update this section, too.
-DAEMON_OPTS="-a ${VARNISH_LISTEN_ADDRESS}:${VARNISH_LISTEN_PORT} \
-             -f ${VARNISH_VCL_CONF} \
-             -T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \
-             -t ${VARNISH_TTL} \
-			 -u ${VARNISH_USER} -g ${VARNISH_GROUP} \
-             -w ${VARNISH_MIN_THREADS},${VARNISH_MAX_THREADS},${VARNISH_THREAD_TIMEOUT} \
-             -n ${VARNISH_NAME} \
-             -s ${VARNISH_STORAGE}"
-
-# default limits
-SERVICE_LIMITS="${SERVICE_LIMIS:--n $NFILES -l $MEMLOCK}"
-
 start() {
 	if [ -f /var/lock/subsys/varnish ]; then
 		msg_already_running "Varnish HTTP accelerator"
 		return
 	fi
+
+	# default limits
+	SERVICE_LIMITS="${SERVICE_LIMIS:--n $NFILES -l $MEMLOCK}"
+
+	# DAEMON_OPTS is used by the init script.  If you add or remove options, make
+	# sure you update this section, too.
+	DAEMON_OPTS="-a ${VARNISH_LISTEN_ADDRESS}:${VARNISH_LISTEN_PORT} \
+				 -f ${VARNISH_VCL_CONF} \
+				 -T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \
+				 -t ${VARNISH_TTL} \
+				 -u ${VARNISH_USER} -g ${VARNISH_GROUP} \
+				 -w ${VARNISH_MIN_THREADS},${VARNISH_MAX_THREADS},${VARNISH_THREAD_TIMEOUT} \
+				 -n ${VARNISH_NAME} \
+				 -s ${VARNISH_STORAGE}"
 
 	msg_starting "Varnish HTTP accelerator"
 	daemon /usr/sbin/varnishd $DAEMON_OPTS $VARNISH_OPTS
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/varnish/varnish.init?r1=1.7&r2=1.8&f=u