diff options
author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2007-06-09 20:35:39 +0000 |
---|---|---|
committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2007-06-09 20:35:39 +0000 |
commit | a237016cb378cef2a31aa7e2f80581ee23c0e2a0 (patch) | |
tree | c427d3f1fc08e45f5120328cf5e1d5f8e8ad82fe /www/varnish2 | |
parent | d9749fb7e61815f76e5134d944cc9cc40c3f13a3 (diff) | |
download | ports-a237016cb378cef2a31aa7e2f80581ee23c0e2a0.tar.gz ports-a237016cb378cef2a31aa7e2f80581ee23c0e2a0.zip |
Notes
Diffstat (limited to 'www/varnish2')
-rw-r--r-- | www/varnish2/Makefile | 2 | ||||
-rw-r--r-- | www/varnish2/files/varnishd.in | 16 | ||||
-rw-r--r-- | www/varnish2/files/varnishlog.in | 10 |
3 files changed, 13 insertions, 15 deletions
diff --git a/www/varnish2/Makefile b/www/varnish2/Makefile index 2e58d01780e2..6e9b39533d96 100644 --- a/www/varnish2/Makefile +++ b/www/varnish2/Makefile @@ -7,7 +7,7 @@ PORTNAME= varnish PORTVERSION= 1.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/www/varnish2/files/varnishd.in b/www/varnish2/files/varnishd.in index 92054025c944..babf2d908701 100644 --- a/www/varnish2/files/varnishd.in +++ b/www/varnish2/files/varnishd.in @@ -31,15 +31,13 @@ rcvar=`set_rcvar` command="%%PREFIX%%/sbin/varnishd" pidfile="/var/run/${name}.pid" -# set defaults - -varnishd_enable=${varnishd_enable:-"NO"} -varnishd_listen=${varnishd_listen:-":6081"} -varnishd_config=${varnishd_config:-"%%PREFIX%%/etc/varnish/default.vcl"} -varnishd_telnet=${varnishd_telnet:-"localhost:6082"} -varnishd_storage=${varnishd_storage:-"file,/tmp,50%"} -varnishd_flags=${varnishd_flags:-"-P ${pidfile} -a ${varnishd_listen} -f ${varnishd_config} -T ${varnishd_telnet} -s ${varnishd_storage}"} - +# read configuration and set defaults load_rc_config ${name} +: ${varnishd_enable="NO"} +: ${varnishd_listen=":6081"} +: ${varnishd_config="%%PREFIX%%/etc/varnish/default.vcl"} +: ${varnishd_telnet="localhost:6082"} +: ${varnishd_storage="file,/tmp,50%"} +: ${varnishd_flags="-P ${pidfile} -a ${varnishd_listen} -f ${varnishd_config} -T ${varnishd_telnet} -s ${varnishd_storage}"} run_rc_command "$1" diff --git a/www/varnish2/files/varnishlog.in b/www/varnish2/files/varnishlog.in index 90dc933c05c1..3c06c610f7bb 100644 --- a/www/varnish2/files/varnishlog.in +++ b/www/varnish2/files/varnishlog.in @@ -28,11 +28,11 @@ rcvar=`set_rcvar` command="%%PREFIX%%/bin/varnishlog" pidfile="/var/run/${name}.pid" -# set defaults - -varnishlog_enable=${varnishlog_enable:-"NO"} -varnishlog_file=${varnishlog_file:-"/var/log/varnish.log"} -varnishlog_flags=${varnishlog_flags:-"-P ${pidfile} -D -a -w ${varnishlog_file}"} +# read configuration and set defaults +load_rc_config ${name} +: ${varnishlog_enable="NO"} +: ${varnishlog_file="/var/log/varnish.log"} +: ${varnishlog_flags="-P ${pidfile} -D -a -w ${varnishlog_file}"} load_rc_config ${name} |