diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2013-11-14 15:35:43 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2013-11-14 15:39:09 +0200 |
| commit | d32344d735b978fb7d30a9fcc4ad1141879c5433 (patch) | |
| tree | 0580961253e8344a5b1963bf2aa443deffda5d9b /main/varnish/varnishd.initd | |
| parent | 6fd658a9994c9d1d1aa3447bddc8c1a15744e766 (diff) | |
| download | aports-d32344d735b978fb7d30a9fcc4ad1141879c5433.tar.bz2 aports-d32344d735b978fb7d30a9fcc4ad1141879c5433.tar.xz | |
main/varnish: add plugin to do maxmind geoip lookups
Diffstat (limited to 'main/varnish/varnishd.initd')
| -rw-r--r-- | main/varnish/varnishd.initd | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/main/varnish/varnishd.initd b/main/varnish/varnishd.initd index 2b9dec79b..7c39a0396 100644 --- a/main/varnish/varnishd.initd +++ b/main/varnish/varnishd.initd @@ -17,6 +17,7 @@ fi default_conf="${instance:-default}.vcl" : ${VARNISH_CONF:=${CFG_FILE:-"/etc/varnish/$default_conf"}} : ${VARNISHD_PID_FILE:="/var/run/varnish/${SVCNAME}.pid"} +: ${VARNISHD_CC_COMMAND:="exec cc -fpic -shared -Wl,-x ${VARNISHD_PLUGIN_CFLAGS} -o %o %s"} : ${VARNISHNCSA_PID_FILE:="/var/run/varnish/varnishncsa${instance:+.}${instance}.pid"} @@ -26,14 +27,14 @@ depend() { } checkconfig() { - if ! $command -C -f ${VARNISH_CONF} >/dev/null 2>&1; then + if ! $command -C -f ${VARNISH_CONF} -p "cc_command=${VARNISHD_CC_COMMAND}" >/dev/null 2>&1; then error "$SVCNAME has deteced an error in your setup:" $command -C -f ${VARNISH_CONF} fi } configtest() { - ebegin "Checkinf ${SVCNAME} configuration" + ebegin "Checking ${SVCNAME} configuration" checkconfig eend $? } @@ -52,6 +53,7 @@ start() { -f ${VARNISH_CONF} \ -P ${VARNISHD_PID_FILE} \ -u varnish -g varnish \ + -p "cc_command=${VARNISHD_CC_COMMAND}" \ $instance_opt \ ${VARNISHD_OPTS} &> /dev/null eend $? |