diff options
author | des <des@FreeBSD.org> | 2014-09-08 12:26:52 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2014-09-08 12:26:52 +0000 |
commit | 1798b7ca76fa9c6311943319eeb651993428e45b (patch) | |
tree | 13a6e87d55331f7fdc221095c0f747523fae4bd4 /etc/rc.d | |
parent | 07b67632680e08ab588ffec71158d1f8b5488e29 (diff) | |
download | FreeBSD-src-1798b7ca76fa9c6311943319eeb651993428e45b.zip FreeBSD-src-1798b7ca76fa9c6311943319eeb651993428e45b.tar.gz |
Revert r271257 after several issues were pointed out. An updated patch
will be committed at a later date.
Diffstat (limited to 'etc/rc.d')
-rwxr-xr-x | etc/rc.d/local_unbound | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/etc/rc.d/local_unbound b/etc/rc.d/local_unbound index 9a7e191..ed69c19 100755 --- a/etc/rc.d/local_unbound +++ b/etc/rc.d/local_unbound @@ -13,6 +13,7 @@ name="local_unbound" desc="local caching forwarding resolver" rcvar="local_unbound_enable" +command="/usr/sbin/unbound" extra_commands="anchor configtest reload setup" start_precmd="local_unbound_prestart" reload_precmd="local_unbound_configtest" @@ -21,9 +22,18 @@ configtest_cmd="local_unbound_configtest" setup_cmd="local_unbound_setup" pidfile="/var/run/${name}.pid" +: ${local_unbound_workdir:=/var/unbound} +: ${local_unbound_config:=${local_unbound_workdir}/unbound.conf} +: ${local_unbound_flags:=-c${local_unbound_config}} +: ${local_unbound_forwardconf:=${local_unbound_workdir}/forward.conf} +: ${local_unbound_anchor:=${local_unbound_workdir}/root.key} +: ${local_unbound_forwarders:=} + +load_rc_config $name + do_as_unbound() { - echo "$@" | /usr/bin/su -m unbound + echo "$@" | su -m unbound } # @@ -31,8 +41,7 @@ do_as_unbound() # local_unbound_anchor() { - do_as_unbound ${local_unbound_program%/*}/unbound-anchor \ - -a ${local_unbound_anchor} + do_as_unbound /usr/sbin/unbound-anchor -a ${local_unbound_anchor} # we can't trust the exit code - check if the file exists [ -f ${local_unbound_anchor} ] } @@ -42,8 +51,7 @@ local_unbound_anchor() # local_unbound_configtest() { - do_as_unbound ${local_unbound_program%/*}/unbound-checkconf \ - ${local_unbound_config} + do_as_unbound /usr/sbin/unbound-checkconf ${local_unbound_config} } # @@ -53,7 +61,7 @@ local_unbound_configtest() local_unbound_setup() { echo "Performing initial setup." - ${local_unbound_program%/*}/local-unbound-setup -n \ + /usr/sbin/local-unbound-setup -n \ -u unbound \ -w ${local_unbound_workdir} \ -c ${local_unbound_config} \ |