diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-30 14:11:51 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-10-30 14:12:52 +0000 |
| commit | e0ae350c49a81528d3189e94e2286cd7a7d3cfd7 (patch) | |
| tree | aa86354199a3124664ff1906628d13effdc1b92a /main/varnish/varnishd.confd | |
| parent | 6b85d6b99939dec708c3a1a27dd4647aa60c7afa (diff) | |
| download | aports-e0ae350c49a81528d3189e94e2286cd7a7d3cfd7.tar.bz2 aports-e0ae350c49a81528d3189e94e2286cd7a7d3cfd7.tar.xz | |
main/varnish: misc fixes in init.d script
http://lists.alpinelinux.org/alpine-devel/3300.html
Diffstat (limited to 'main/varnish/varnishd.confd')
| -rw-r--r-- | main/varnish/varnishd.confd | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/main/varnish/varnishd.confd b/main/varnish/varnishd.confd index 1471f8207..4d72cb7f9 100644 --- a/main/varnish/varnishd.confd +++ b/main/varnish/varnishd.confd @@ -2,7 +2,7 @@ # Varnish configuration file -VARNISH_CONF="/etc/varnish/default.vcl" +# VARNISH_CONF="/etc/varnish/default.vcl" VARNISH_SECRET_FILE="/etc/varnish/secret" @@ -10,27 +10,20 @@ VARNISH_SECRET_FILE="/etc/varnish/secret" VARNISH_LISTEN_ADDRESS= VARNISH_PORT=8080 -# Varnish work files -VARNISH_WORKING_DIR="/var/cache/varnish" +# Varnish storage VARNISH_STORAGE_FILE="/var/cache/varnish/varnish_storage.bin" VARNISH_STORAGE_SIZE=50M VARNISH_STORAGE="file,${VARNISH_STORAGE_FILE},${VARNISH_STORAGE_SIZE}" - -# PID files -VARNISHD_PID_FILE=/var/run/varnish/varnishd.pid -VARNISHNCSA_PID_FILE=/var/run/varnish/varnishncsa.pid +# VARNISH_STORAGE="malloc,${VARNISH_STORAGE_SIZE}" # Varnish admin ADMINHOSTPORT="127.0.0.1:65080" # options passed to varnish on startup # please see the varnishd man page for more options -VARNISHD_OPTS="-a ${VARNISH_LISTEN_ADDRESS}:${VARNISH_PORT} -f ${VARNISH_CONF} -s ${VARNISH_STORAGE} -n $VARNISH_WORKING_DIR -T $ADMINHOSTPORT" - -# add user -VARNISHD_OPTS="-u varnish $VARNISHD_OPTS" +VARNISHD_OPTS="-a ${VARNISH_LISTEN_ADDRESS}:${VARNISH_PORT} -s ${VARNISH_STORAGE} -T $ADMINHOSTPORT" # arguments passed to varnishncsa # please see the varnishncsa man page for more options -VARNISHNCSA_ARGS="-c -a -w /var/log/varnish/access.log" +VARNISHNCSA_ARGS="-c -a -w /var/log/varnish/${SVCNAME}.log" |