d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Create /var/unbound/conf.d for additional configuration files.

Browse Source 
Ensure that it is used if present.

MFH:	3 weeks
This commit is contained in:
des 2014-05-29 22:34:04 +00:00
parent ad73b7a65d
commit bb147ad2e0
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/mtree/BSD.var.dist
View File

@ -96,6 +96,8 @@
..
..
unbound uname=unbound gname=unbound mode=0755
conf.d uname=unbound gname=unbound mode=0755
..
..
yp
..

13
usr.sbin/unbound/local-setup/local-unbound-setup.sh
View File

@ -34,6 +34,7 @@ user=""
unbound_conf=""
forward_conf=""
workdir=""
confdir=""
chrootdir=""
anchor=""
pidfile=""
@ -55,6 +56,7 @@ bkext=$(date "+%Y%m%d.%H%M%S")
set_defaults() {
: ${user:=unbound}
: ${workdir:=/var/unbound}
: ${confdir:=${workdir}/conf.d}
: ${unbound_conf:=${workdir}/unbound.conf}
: ${forward_conf:=${workdir}/forward.conf}
: ${anchor:=${workdir}/root.key}
@ -195,6 +197,9 @@ gen_unbound_conf() {
if [ -f "${forward_conf}" ] ; then
echo "include: ${forward_conf}"
fi
if [ -d "${confdir}" ] ; then
echo "include: ${confdir}/*.conf"
fi
}
#
@ -227,7 +232,8 @@ usage() {
echo "options:"
echo " -n do not start unbound"
echo " -a path full path to trust anchor file"
echo " -c path full path to unbound configuration"
echo " -C path full path to additional configuration directory"
echo " -c path full path to unbound configuration file"
echo " -f path full path to forwarding configuration"
echo " -p path full path to pid file"
echo " -R path full path to resolvconf.conf"
@ -247,11 +253,14 @@ main() {
#
# Parse and validate command-line options
#
while getopts "a:c:f:np:R:r:s:u:w:" option ; do
while getopts "a:C:c:f:np:R:r:s:u:w:" option ; do
case $option in
a)
anchor="$OPTARG"
;;
C)
confdir="$OPTARG"
;;
c)
unbound_conf="$OPTARG"
;;