[master] 11cc8b2 Correct comment

Federico G. Schwindt fgsch at lodoss.net
Tue Oct 7 13:17:51 CEST 2014


commit 11cc8b2fff717d1889a3e51fb320e55c6c4d9e85
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Tue Oct 7 12:15:19 2014 +0100

    Correct comment
    
    While here drop -w in favour of -p and do some whitespace
    cleanup.

diff --git a/varnish.default b/varnish.default
index 152b35e..a9a063e 100644
--- a/varnish.default
+++ b/varnish.default
@@ -31,17 +31,17 @@ MEMLOCK=82000
 #
 # DAEMON_OPTS="-a :6081 \
 #              -T localhost:6082 \
-# 	     -b localhost:8080 \
-# 	     -u varnish -g varnish \
-#            -S /etc/varnish/secret \
-# 	     -s file,/var/lib/varnish/$INSTANCE/varnish_storage.bin,1G"
+#              -b localhost:8080 \
+#              -u varnish -g varnish \
+#              -S /etc/varnish/secret \
+#              -s file,/var/lib/varnish/$INSTANCE/varnish_storage.bin,1G"
 
 
 ## Alternative 2, Configuration with VCL
 #
 # Listen on port 6081, administration on localhost:6082, and forward to
-# one content server selected by the vcl file, based on the request.  Use a 1GB
-# fixed-size cache file.
+# one content server selected by the vcl file, based on the request.
+# Use a 256MB memory based cache.
 #
 DAEMON_OPTS="-a :6081 \
              -T localhost:6082 \
@@ -85,7 +85,7 @@ DAEMON_OPTS="-a :6081 \
 #
 # # File containing administration secret
 # VARNISH_SECRET_FILE=/etc/varnish/secret
-# 
+#
 # # Backend storage specification
 # VARNISH_STORAGE="file,${VARNISH_STORAGE_FILE},${VARNISH_STORAGE_SIZE}"
 #
@@ -98,8 +98,10 @@ DAEMON_OPTS="-a :6081 \
 #              -f ${VARNISH_VCL_CONF} \
 #              -T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \
 #              -t ${VARNISH_TTL} \
-#              -w ${VARNISH_MIN_THREADS},${VARNISH_MAX_THREADS},${VARNISH_THREAD_TIMEOUT} \
-# 	       -S ${VARNISH_SECRET_FILE} \
+#              -p thread_pool_min=${VARNISH_MIN_THREADS} \
+#              -p thread_pool_max=${VARNISH_MAX_THREADS} \
+#              -p thread_pool_timeout=${VARNISH_THREAD_TIMEOUT} \
+#              -S ${VARNISH_SECRET_FILE} \
 #              -s ${VARNISH_STORAGE}"
 #
 



More information about the varnish-commit mailing list