| @@ -1,32 +1,17 @@
---- redhat/varnish.sysconfig.orig 2011-01-31 00:01:54.662114682 +0100
-+++ redhat/varnish.sysconfig 2011-01-31 00:08:46.724943069 +0100
-@@ -83,24 +83,19 @@
+--- redhat/varnish.sysconfig.orig 2010-10-25 20:30:27.776325119 +0200
++++ redhat/varnish.sysconfig 2010-10-25 20:31:36.264094567 +0200
+@@ -34,13 +34,7 @@
+ # one content server selected by the vcl file, based on the request. Use a
+ # fixed-size cache file.
#
- # # Cache file size: in bytes, optionally using k / M / G / T suffix,
- # # or in percentage of available disk space using the % suffix.
--VARNISH_STORAGE_SIZE=1G
-+VARNISH_STORAGE_SIZE=512M
- #
- # # Backend storage specification
- VARNISH_STORAGE="file,${VARNISH_STORAGE_FILE},${VARNISH_STORAGE_SIZE}"
- #
- # # Default TTL used when the backend does not specify one
- VARNISH_TTL=120
--#
-+#
-+# define more parameters like "-o send_timeout=1200"
-+VARNISH_OPTS=
- # # 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} \
-- -w ${VARNISH_MIN_THREADS},${VARNISH_MAX_THREADS},${VARNISH_THREAD_TIMEOUT} \
+-DAEMON_OPTS="-a :6081 \
+- -T localhost:6082 \
+- -f /etc/varnish/default.vcl \
- -u varnish -g varnish \
-- -S ${VARNISH_SECRET_FILE} \
-- -s ${VARNISH_STORAGE}"
-+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} -w ${VARNISH_MIN_THREADS},${VARNISH_MAX_THREADS},${VARNISH_THREAD_TIMEOUT} -u varnish -g varnish ${VARNISH_OPTS} -S ${VARNISH_SECRET_FILE} -s ${VARNISH_STORAGE}"
- #
-
+- -S /etc/varnish/secret \
+- -s file,/var/lib/varnish/varnish_storage.bin,1G"
+-
++DAEMON_OPTS="-a :6081 -T localhost:6082 -f /etc/varnish/default.vcl -u varnish -g varnish -S /etc/varnish/secret -s file,/var/lib/varnish/varnish_storage.bin,512M"
+ ## Alternative 3, Advanced configuration
+ #
|
