mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-30 10:38:37 +00:00
Code Issues Releases Activity

Add varnishd_extra_flags option to permit passing additional flags to

Browse Source 
varnishd

Clean up rc scripts per rclint recommendations

Differential Revision:	https://reviews.freebsd.org/D2605
This commit is contained in:
Mark Felder 2015-05-27 14:34:42 +00:00
parent 86f30fa337
commit ae06d6a3ac
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=387610
4 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/varnish4/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= varnish
PORTVERSION= 4.0.3
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= http://repo.varnish-cache.org/source/
PKGNAMESUFFIX= 4

33
www/varnish4/files/varnishd.in
View File

@ -52,26 +52,28 @@
. /etc/rc.subr
name="varnishd"
name=varnishd
rcvar=varnishd_enable
command="%%PREFIX%%/sbin/${name}"
# read configuration and set defaults
load_rc_config ${name}
: ${varnishd_enable:="NO"}
: ${varnishd_pidfile:="/var/run/${name}.pid"}
: ${varnishd_listen:=":80"}
: ${varnishd_admin:="localhost:81"}
: ${varnishd_backend:="localhost:8080"}
: ${varnishd_storage:="file,/tmp,100M"}
: ${varnishd_hash:="classic,16383"}
: ${varnishd_user:="www"}
: ${varnishd_group:="www"}
: ${varnishd_enable:=NO}
: ${varnishd_pidfile=/var/run/${name}.pid}
: ${varnishd_listen=:80}
: ${varnishd_admin=localhost:81}
: ${varnishd_backend=localhost:8080}
: ${varnishd_storage=file,/tmp,100M}
: ${varnishd_hash=classic,16383}
: ${varnishd_user=www}
: ${varnishd_group=www}
command="%%PREFIX%%/sbin/${name}"
pidfile="${varnishd_pidfile}"
if [ -n "${varnishd_config}" ] ; then
: ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}"}
: ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group} ${varnishd_extra_flags}"}
else
: ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group}"}
: ${varnishd_flags:="-P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} -u ${varnishd_user} -g ${varnishd_group} ${varnishd_extra_flags}"}
fi
# If we leave these set, rc.subr will su to them before starting
@ -79,5 +81,4 @@ fi
unset varnishd_user
unset varnishd_group
pidfile="${varnishd_pidfile}"
run_rc_command "$1"

15
www/varnish4/files/varnishlog.in
View File

@ -33,17 +33,16 @@
. /etc/rc.subr
name="varnishlog"
name=varnishlog
rcvar=varnishlog_enable
command="%%PREFIX%%/bin/${name}"
# read configuration and set defaults
load_rc_config ${name}
: ${varnishlog_enable:="NO"}
: ${varnishlog_pidfile:="/var/run/${name}.pid"}
: ${varnishlog_file:="/var/log/varnish.log"}
: ${varnishlog_flags:="-P ${varnishlog_pidfile} -D -a -w ${varnishlog_file}"}
: ${varnishlog_enable:=NO}
: ${varnishlog_pidfile=/var/run/${name}.pid}
: ${varnishlog_file=/var/log/varnish.log}
: ${varnishlog_flags="-P ${varnishlog_pidfile} -D -a -w ${varnishlog_file}"}
command="%%PREFIX%%/bin/${name}"
pidfile=${varnishlog_pidfile}
run_rc_command "$1"

17
www/varnish4/files/varnishncsa.in
View File

@ -37,18 +37,17 @@
. /etc/rc.subr
name="varnishncsa"
name=varnishncsa
rcvar=varnishncsa_enable
command="%%PREFIX%%/bin/${name}"
# read configuration and set defaults
load_rc_config ${name}
: ${varnishncsa_enable:="NO"}
: ${varnishncsa_pidfile:="/var/run/${name}.pid"}
: ${varnishncsa_file:="/var/log/${name}.log"}
: ${varnishncsa_logformat:=""}
: ${varnishncsa_flags:="-P ${varnishncsa_pidfile} -D -a -c -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"}
: ${varnishncsa_enable:=NO}
: ${varnishncsa_pidfile=/var/run/${name}.pid}
: ${varnishncsa_file=/var/log/${name}.log}
: ${varnishncsa_flags="-P ${varnishncsa_pidfile} -D -a -c -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"}
command="%%PREFIX%%/bin/${name}"
pidfile=${varnishncsa_pidfile}
run_rc_command "$1"