- update from sources

Changed files:
    varnish.sysconfig -> 1.2

diff --git a/varnish.sysconfig b/varnish.sysconfig
index a6cc7005dc801a2d304f8ec1a6f5a7c435c9ba82..78185ed28bd9d96820c792eee45aaac0e8eab19d 100644 (file)
--- a/varnish.sysconfig
+++ b/varnish.sysconfig
@@ -1,51 +1,87 @@
+# Configuration file for varnish
 #
-# Default variables for varnish
+# /etc/rc.d/init.d/varnish expects the variable $DAEMON_OPTS to be set from this
+# shell script fragment.
 #
 
-# The main daemon binary
-VARNISHD=/usr/sbin/varnish
+# Maximum number of open files (for ulimit -n)
+NFILES=131072
 
-# VCL Configuration file. This is the "main configuration file"
-VARNISH_VCL_CONF=/etc/varnish/vcl.conf
-
-
-# Default address and port to bind to. 
-# To make varnish accept normal http traffic,
-# change the listen port to 80
-VARNISH_LISTEN_ADDRESS=0.0.0.0
-VARNISH_LISTEN_PORT=6081
-
-
-# Telnet admin interface listen address and port
-VARNISH_ADMIN_LISTEN_ADDRESS=127.0.0.1
-VARNISH_ADMIN_LISTEN_PORT=6082
-
-
-# The minimum number of threads to start
-VARNISH_MIN_WORKER_THREADS=1
-
-
-# Maximum number of worker threads or INF for unlimited
-VARNISH_MAX_WORKER_THREADS=INF
-
-
-# Timeout value in seconds for threads to return
-VARNISH_WORKER_THREAD_TIMEOUT=10 
-
-
-# Hash algorithm to be used
-VARNISH_HASHOPTION=classic
+# This file contains 4 alternatives, please use only one.
 
+## Alternative 1, Minimal configuration, no VCL
+#
+# Listen on port 6081, administration on localhost:6082, and forward to
+# content server on localhost:8080.  Use a fixed-size cache file.
+#
+#DAEMON_OPTS="-a :6081 \
+#             -T localhost:6082 \
+#             -b localhost:8080 \
+#             -s file,/var/lib/varnish/varnish_storage.bin,1G"
 
-# Maximum size of the backend storagefile in bytes
-VARNISH_BACKEND_STORAGE_SIZE=10240000
-VARNISH_BACKEND_STORAGE_FILE=/var/lib/varnish/varnish_storage.bin
 
+## 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
+# fixed-size cache file.
+#
+DAEMON_OPTS="-a :6081 \
+             -T localhost:6082 \
+             -f /etc/varnish/default.vcl \
+             -s file,/var/lib/varnish/varnish_storage.bin,1G"
 
-# Backend storage specification
-VARNISH_BACKEND_STORAGE="file,${VARNISH_BACKEND_STORAGE_FILE},${VARNISH_BACKEND_STORAGE_SIZE}"
 
+## Alternative 3, Advanced configuration
+#
+# See varnishd(1) for more information.
+#
+# # Main configuration file. You probably want to change it :)
+# VARNISH_VCL_CONF=/etc/varnish/default.vcl
+#
+# # Default address and port to bind to
+# # Blank address means all IPv4 and IPv6 interfaces, otherwise specify
+# # a host name, an IPv4 dotted quad, or an IPv6 address in brackets.
+# VARNISH_LISTEN_ADDRESS=
+# VARNISH_LISTEN_PORT=6081
+#
+# # Telnet admin interface listen address and port
+# VARNISH_ADMIN_LISTEN_ADDRESS=127.0.0.1
+# VARNISH_ADMIN_LISTEN_PORT=6082
+#
+# # The minimum number of worker threads to start
+# VARNISH_MIN_THREADS=1
+#
+# # The Maximum number of worker threads to start
+# VARNISH_MAX_THREADS=1000
+#
+# # Idle timeout for worker threads
+# VARNISH_THREAD_TIMEOUT=120
+#
+# # Cache file location
+# VARNISH_STORAGE_FILE=/var/lib/varnish/varnish_storage.bin
+#
+# # 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
+#
+# # 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
+#
+# # 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} \
+#              -s ${VARNISH_STORAGE}"
+#
 
-# Set default ttl in secounds
-VARNISH_TTL=120
 
+## Alternative 4, Do It Yourself. See varnishd(1) for more information.
+#
+# DAEMON_OPTS=""