Page MenuHomeFreeBSD
Files F137289449

D4016.id9784.diff
No OneTemporary
Actions

D4016.id9784.diff
View Options

Index: www/varnish4/Makefile
===================================================================
--- www/varnish4/Makefile
+++ www/varnish4/Makefile
@@ -2,7 +2,7 @@
PORTNAME= varnish
PORTVERSION= 4.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://repo.varnish-cache.org/source/
PKGNAMESUFFIX= 4
Index: www/varnish4/files/varnishd.in
===================================================================
--- www/varnish4/files/varnishd.in
+++ www/varnish4/files/varnishd.in
@@ -65,6 +65,11 @@
command="%%PREFIX%%/sbin/${name}"
pidfile="${varnishd_pidfile}"
+configtest_cmd="varnishd_checkconfig"
+reload_cmd="varnishd_reload"
+restart_precmd="varnishd_checkconfig"
+start_precmd="varnishd_precmd"
+extra_commands="status reload configtest"
if [ -n "${varnishd_config}" ] ; then
: ${varnishd_flags:="-j unix,user=${varnishd_jailuser} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"}
@@ -72,4 +77,52 @@
: ${varnishd_flags:="-j unix,user=${varnishd_jailuser} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"}
fi
+varnishd_checkconfig()
+{
+ if [ -z "${varnishd_config}" ]; then
+ echo "${name}: nothing to check, no configuration file defined, builtin VCL used"
+ else
+ echo "Performing sanity check on ${name} configuration:"
+ if eval ${command} -C -f "${varnishd_config}" 2> /dev/null ; then
+ echo "${name}: the configuration file ${varnishd_config} syntax is ok"
+ else
+ err 1 "${name}: the configuration file ${varnishd_config} syntax is NOT ok"
+ fi
+ fi
+}
+
+# Adapted from work done by Ingvar Hagelund <ingvar@redpill-linpro.com> (see redhat/varnish_reload_vcl)
+varnishd_reload()
+{
+ local _current_config_name _new_config_name _varnishadm_cmd
+
+ if [ -z "${varnishd_config}" ]; then
+ echo "${name}: nothing to reload, no configuration file defined, builtin VCL used"
+ else
+ _new_config_name="rc.d_reloaded@$(date +%Y%m%d%H%M%S)"
+ _varnishadm_cmd="%%PREFIX%%/bin/varnishadm ${varnish_cli_flags}"
+ if ! eval ${_varnishadm_cmd} vcl.list > /dev/null; then
+ err 1 "${name}: can't connect to varnishadm"
+ fi
+ _current_config_name=$(${_varnishadm_cmd} vcl.list | awk ' /^active/ { print $3 } ')
+ if ! eval ${_varnishadm_cmd} vcl.load ${_new_config_name} ${varnishd_config} > /dev/null; then
+ err 1 "${name}: vcl.load failed, you're still using previous rules (${_current_config_name})"
+ fi
+ if eval ${_varnishadm_cmd} vcl.use ${_new_config_name} > /dev/null; then
+ echo "VCL file \"${varnishd_config}\" has been successfully loaded as \"${_new_config_name}\""
+ echo "To remove previous loaded configurations, you should run \"${_varnishadm_cmd} vcl.discard <configname>\" by yourself"
+ else
+ err 1 "${name}: vcl.use failed, you're still using previous rules (${_current_config_name})"
+ fi
+ fi
+
+ return 0
+}
+
+varnishd_precmd()
+{
+ # Check config before starting
+ varnishd_checkconfig
+}
+
run_rc_command "$1"
Index: www/varnish4/files/varnishlog.in
===================================================================
--- www/varnish4/files/varnishlog.in
+++ www/varnish4/files/varnishlog.in
@@ -21,12 +21,12 @@
# default: "/var/log/varnish.log"
#
# varnishlog_flags - command line arguments.
-# default: "-D -P ${varnishlog_pidfile} -a -w ${varnishlog_file}"
+# default: "-t 0 -D -P ${varnishlog_pidfile} -a -w ${varnishlog_file}"
#
# Add the following line to /etc/newsyslog.conf to rotate the log file
# once a day:
#
-# /var/log/varnish.log 640 7 * @T00 JB /var/run/varnishlog.pid
+# /var/log/varnish.log varnishlog:varnish 640 7 * @T00 JB /var/run/varnishlog.pid
#
# See varnishlog(1) for a detailed overview of command-line options.
#
@@ -40,7 +40,7 @@
: ${varnishlog_enable:=NO}
: ${varnishlog_pidfile=/var/run/${name}.pid}
: ${varnishlog_file=/var/log/varnish.log}
-: ${varnishlog_flags="-P ${varnishlog_pidfile} -D -a -A -w ${varnishlog_file}"}
+: ${varnishlog_flags="-t 0 -P ${varnishlog_pidfile} -D -a -A -w ${varnishlog_file} -t 0"}
: ${varnishlog_user=varnishlog}
command="%%PREFIX%%/bin/${name}"
@@ -50,33 +50,12 @@
precmd()
{
if [ ! -e ${pidfile} ]; then
- install -o ${varnishlog_user} -g varnish /dev/null ${pidfile};
+ install -o ${varnishlog_user} -g varnish -m 644 /dev/null ${pidfile};
fi
if [ ! -e ${varnishlog_file} ]; then
- install -o ${varnishlog_user} -g varnish /dev/null ${varnishlog_file};
+ install -o ${varnishlog_user} -g varnish -m 640 /dev/null ${varnishlog_file};
fi
-
- waitcount=0
- vsm=%%PREFIX%%/varnish/$(hostname)/_.vsm
-
- # wait no longer than 5s for _.vsm file to arrive from varnishd
- while :
- do
- if [ -f ${vsm} ] ; then
- break
- else
- case "${waitcount}" in
- 5) echo "${name}: Failed to start. Missing ${vsm} ?"
- break
- ;;
- *) echo "${name}: waiting for ${vsm}"
- waitcount=$((waitcount+1))
- sleep 1
- ;;
- esac
- fi
- done
}
run_rc_command "$1"
Index: www/varnish4/files/varnishncsa.in
===================================================================
--- www/varnish4/files/varnishncsa.in
+++ www/varnish4/files/varnishncsa.in
@@ -21,7 +21,7 @@
# default: "/var/log/varnishncsa.log"
#
# varnishncsa_flags - command line arguments.
-# default: "-D -P ${varnishncsa_pidfile} -a -w ${varnishncsa_file}${varnishncsa_logformat:+ -P \"$varnishncsa_logformat\""
+# default: "-t 0 -D -P ${varnishncsa_pidfile} -a -w ${varnishncsa_file}${varnishncsa_logformat:+ -P \"$varnishncsa_logformat\""
#
# varnishncsa_logformat - log file format.
# default: "" (uses varnishncsa's default format)
@@ -30,7 +30,7 @@
# Add the following line to /etc/newsyslog.conf to rotate the log file
# once a day:
#
-# /var/log/varnishncsa.log 640 7 * @T00 JB /var/run/varnishncsa.pid
+# /var/log/varnishncsa.log varnishlog:varnish 640 7 * @T00 JB /var/run/varnishncsa.pid
#
# See varnishncsa(1) for a detailed overview of command-line options.
#
@@ -45,7 +45,7 @@
: ${varnishncsa_enable:=NO}
: ${varnishncsa_pidfile=/var/run/${name}.pid}
: ${varnishncsa_file=/var/log/${name}.log}
-: ${varnishncsa_flags="-P ${varnishncsa_pidfile} -D -a -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"}
+: ${varnishncsa_flags="-t 0 -P ${varnishncsa_pidfile} -D -a -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"}
: ${varnishncsa_user=varnishlog}
command="%%PREFIX%%/bin/${name}"
@@ -55,11 +55,11 @@
precmd()
{
if [ ! -e ${pidfile} ]; then
- install -o ${varnishncsa_user} -g varnish /dev/null ${pidfile};
+ install -o ${varnishncsa_user} -g varnish -m 644 /dev/null ${pidfile};
fi
if [ ! -e ${varnishncsa_file} ]; then
- install -o ${varnishncsa_user} -g varnish /dev/null ${varnishncsa_file};
+ install -o ${varnishncsa_user} -g varnish -m 640 /dev/null ${varnishncsa_file};
fi
waitcount=0

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 23, 2:38 AM (6 h, 1 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25991121
Default Alt Text
D4016.id9784.diff (6 KB)

Event Timeline