Attachment 146844 Details for Bug 193255 – A patch to add the default values into etc/defaults/rc.conf.

[patch] A patch to add the default values into etc/defaults/rc.conf.

rc_d_local_unbound.20140905-1.diff (text/plain), 2.44 KB, created by Hiroki Sato on 2014-09-05 06:52:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hiroki Sato

Created: 2014-09-05 06:52:52 UTC

Size: 2.44 KB

patch

obsolete

>Index: etc/defaults/rc.conf
>===================================================================
>--- etc/defaults/rc.conf	(revision 270991)
>+++ etc/defaults/rc.conf	(working copy)
>@@ -267,6 +267,13 @@
> hastd_flags=""			# Optional flags to hastd.
> ctld_enable="NO"		# CAM Target Layer / iSCSI target daemon.
> local_unbound_enable="NO"	# local caching resolver
>+local_unbound_program="/usr/sbin/unbound"
>+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=""
> 
> #
> # kerberos. Do not run the admin daemons on slave servers
>Index: etc/rc.d/local_unbound
>===================================================================
>--- etc/rc.d/local_unbound	(revision 270991)
>+++ etc/rc.d/local_unbound	(working copy)
>@@ -13,7 +13,6 @@
> 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"
>@@ -22,18 +21,9 @@
> 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 "$@" | su -m unbound
>+	echo "$@" | /usr/bin/su -m unbound
> }
> 
> #
>@@ -41,7 +31,8 @@
> #
> local_unbound_anchor()
> {
>-	do_as_unbound /usr/sbin/unbound-anchor -a ${local_unbound_anchor}
>+	do_as_unbound ${unbound_program%/*}/unbound-anchor \
>+	    -a ${local_unbound_anchor}
> 	# we can't trust the exit code - check if the file exists
> 	[ -f ${local_unbound_anchor} ]
> }
>@@ -51,7 +42,8 @@
> #
> local_unbound_configtest()
> {
>-	do_as_unbound /usr/sbin/unbound-checkconf ${local_unbound_config}
>+	do_as_unbound ${unbound_program%/*}/unbound-checkconf \
>+	    ${local_unbound_config}
> }
> 
> #
>@@ -61,7 +53,7 @@
> local_unbound_setup()
> {
> 	echo "Performing initial setup."
>-	/usr/sbin/local-unbound-setup -n \
>+	${unbound_program}/local-unbound-setup -n \
> 	    -u unbound \
> 	    -w ${local_unbound_workdir} \
> 	    -c ${local_unbound_config} \

Actions: View | Diff

Attachments on bug 193255: 146680 | 146844 | 147052 | 147061