From 996a30a1677613ff7f4893295e7053cb9162aa7f Mon Sep 17 00:00:00 2001 From: Bernard Spil Date: Fri, 26 Jan 2018 10:16:16 +0000 Subject: dns/unbound: Fix rc-script with config in flags - Adds new option unbound_config PR: 225360 Submitted by: jaap@NLnetLabs.nl Approved by: jaap@NLnetLabs.nl (maintainer) --- dns/unbound/files/unbound.in | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dns/unbound/files/unbound.in b/dns/unbound/files/unbound.in index 932ceee95ec6..5063dbfcd314 100644 --- a/dns/unbound/files/unbound.in +++ b/dns/unbound/files/unbound.in @@ -23,13 +23,15 @@ rcvar=unbound_enable command="%%PREFIX%%/sbin/unbound" extra_commands="reload" start_precmd="start_precmd" -reload_precmd="%%PREFIX%%/sbin/unbound-checkconf >/dev/null" +reload_precmd="%%PREFIX%%/sbin/unbound-checkconf ${unbound_conf} >/dev/null" load_rc_config $name pidfile=${unbound_pidfile:-"%%PREFIX%%/etc/unbound/unbound.pid"} unbound_enable=${unbound_enable:-"NO"} unbound_anchorflags=${unbound_anchorflags:-""} +unbound_conf=${unbound_conf:-"%%ETCDIR%%/unbound.conf"} +unbound_flags=${unbound_flags:-" -c ${unbound_conf}"} start_precmd() { @@ -40,7 +42,7 @@ start_precmd() su -m unbound -c "%%PREFIX%%/sbin/unbound-anchor ${unbound_anchorflags}" fi echo . - %%PREFIX%%/sbin/unbound-checkconf > /dev/null + %%PREFIX%%/sbin/unbound-checkconf ${unbound_conf} > /dev/null return $? } -- cgit v1.2.3