|
[-]
[+]
|
Changed |
varnish.spec
|
|
|
|
[-]
[+]
|
Changed |
varnish-redhat-pid.patch
^
|
| @@ -1,15 +1,15 @@
---- redhat/varnish.initrc.orig 2008-10-14 19:19:10.000000000 +0200
-+++ redhat/varnish.initrc 2008-10-14 19:25:13.000000000 +0200
+--- redhat/varnish.initrc.orig 2011-06-16 13:24:54.000000000 +0200
++++ redhat/varnish.initrc 2011-07-02 21:51:35.499992203 +0200
@@ -6,7 +6,7 @@
# description: Varnish is a high-perfomance HTTP accelerator
# processname: varnishd
# config: /etc/sysconfig/varnish
--# pidfile: /var/run/varnish/varnishd.pid
+-# pidfile: /var/run/varnishd.pid
+# pidfile: /var/run/varnish/varnish.pid
### BEGIN INIT INFO
# Provides: varnish
-@@ -21,7 +21,7 @@
+@@ -23,7 +23,7 @@
. /etc/init.d/functions
retval=0
@@ -17,10 +17,10 @@
+pidfile=/var/run/varnish/varnish.pid
exec="/usr/sbin/varnishd"
- prog="varnishd"
---- redhat/varnishlog.initrc.orig 2008-10-14 19:24:08.000000000 +0200
-+++ redhat/varnishlog.initrc 2008-10-14 19:24:39.000000000 +0200
-@@ -20,7 +20,7 @@
+ reload_exec="/usr/bin/varnish_reload_vcl"
+--- redhat/varnishlog.initrc.orig 2011-06-16 13:24:54.000000000 +0200
++++ redhat/varnishlog.initrc 2011-07-02 21:48:25.021806267 +0200
+@@ -22,7 +22,7 @@
. /etc/init.d/functions
retval=0
@@ -29,9 +29,9 @@
lockfile="/var/lock/subsys/varnishlog"
logfile="/var/log/varnish/varnish.log"
---- redhat/varnishncsa.initrc.orig 2008-10-14 19:24:13.000000000 +0200
-+++ redhat/varnishncsa.initrc 2008-10-14 19:24:53.000000000 +0200
-@@ -20,7 +20,7 @@
+--- redhat/varnishncsa.initrc.orig 2011-06-16 13:24:54.000000000 +0200
++++ redhat/varnishncsa.initrc 2011-07-02 21:48:25.021806267 +0200
+@@ -22,7 +22,7 @@
. /etc/init.d/functions
retval=0
|
|
[-]
[+]
|
Changed |
varnish-sysconfig.patch
^
|
| @@ -1,17 +1,18 @@
---- 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.
+--- redhat/varnish.sysconfig.orig 2011-06-16 13:24:54.000000000 +0200
++++ redhat/varnish.sysconfig 2011-07-02 22:06:46.427916195 +0200
+@@ -93,14 +93,7 @@
#
--DAEMON_OPTS="-a :6081 \
-- -T localhost:6082 \
-- -f /etc/varnish/default.vcl \
+ # # 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} \
- -u varnish -g varnish \
-- -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
+- -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 -S ${VARNISH_SECRET_FILE} -s ${VARNISH_STORAGE}"
#
+
+
|
