svn commit: r255809 - in head: etc etc/defaults etc/rc.d share/man/man5 share/man/man8 tools/build/mk usr.sbin/unbound usr.sbin/unbound/local-setup

[Bryan Drewery]

On 9/22/2013 11:36 PM, Dag-Erling Smørgrav wrote:
> Author: des
> Date: Mon Sep 23 04:36:51 2013
> New Revision: 255809
> URL: http://svnweb.freebsd.org/changeset/base/255809
> 
> Log:
>   Add a setup script for unbound(8) called local-unbound-setup.  It
>   generates a configuration suitable for running unbound as a caching
>   forwarding resolver, and configures resolvconf(8) to update unbound's
>   list of forwarders in addition to /etc/resolv.conf.  The initial list
>   is taken from the existing resolv.conf, which is rewritten to point to
>   localhost.  Alternatively, a list of forwarders can be provided on the
>   command line.
>   
>   To assist this script, add an rc.subr command called "enabled" which
>   does nothing except return 0 if the service is enabled and 1 if it is
>   not, without going through the usual checks.  We should consider doing
>   the same for "status", which is currently pointless.
>   
>   Add an rc script for unbound, called local_unbound.  If there is no
>   configuration file, the rc script runs local-unbound-setup to generate
>   one.
>   
>   Note that these scripts place the unbound configuration files in
>   /var/unbound rather than /etc/unbound.  This is necessary so that
>   unbound can reload its configuration while chrooted.  We should
>   probably provide symlinks in /etc.

Why not add a link now in etc/Makefile? This would be surprising to not
find unbound.conf in /etc/

Named was doing this as well:

  .if ${MK_BIND_MTREE} != "no"
          if [ ! -e ${DESTDIR}/etc/namedb ]; then \
                  ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \
          fi
  .endif

Should use ${INSTALL_SYMLINK} though so brooks' work is used. Patch
attached.


-- 
Regards,
Bryan Drewery


-------------- next part --------------
diff --git etc/Makefile etc/Makefile
index ae52d79..5a6dabd 100644
--- etc/Makefile
+++ etc/Makefile
@@ -247,6 +247,11 @@ distribution:
 		ln -s ../var/named/etc/namedb ${DESTDIR}/etc/namedb; \
 	fi
 .endif
+.if ${MK_UNBOUND} != "no"
+	if [ ! -e ${DESTDIR}/etc/unbound ]; then \
+		${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \
+	fi
+.endif
 .if ${MK_BIND_ETC} != "no"
 	${_+_}cd ${.CURDIR}/namedb; ${MAKE} install
 .endif