From owner-svn-src-head@FreeBSD.ORG Mon Sep 23 13:34:01 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id F0CCFCB4 for ; Mon, 23 Sep 2013 13:34:00 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BE87B2D27 for ; Mon, 23 Sep 2013 13:34:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id r8NDY07k006731 for ; Mon, 23 Sep 2013 13:34:00 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id r8NDY0ZR006725 for svn-src-head@freebsd.org; Mon, 23 Sep 2013 13:34:00 GMT (envelope-from bdrewery) Received: (qmail 16854 invoked from network); 23 Sep 2013 08:33:59 -0500 Received: from unknown (HELO ?10.10.0.24?) (freebsd@shatow.net@10.10.0.24) by sweb.xzibition.com with ESMTPA; 23 Sep 2013 08:33:59 -0500 Message-ID: <52404344.2080002@FreeBSD.org> Date: Mon, 23 Sep 2013 08:33:56 -0500 From: Bryan Drewery Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: =?UTF-8?B?RGFnLUVybGluZyBTbcO4cmdyYXY=?= Subject: Re: 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 References: <201309230436.r8N4apZZ019707@svn.freebsd.org> In-Reply-To: <201309230436.r8N4apZZ019707@svn.freebsd.org> X-Enigmail-Version: 1.5.2 OpenPGP: id=3C9B0CF9; url=http://www.shatow.net/bryan/bryan.asc Content-Type: multipart/mixed; boundary="------------040907060502040105050102" Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Sep 2013 13:34:01 -0000 This is a multi-part message in MIME format. --------------040907060502040105050102 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --------------040907060502040105050102 Content-Type: text/plain; charset=windows-1252; name="etc-unbound.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="etc-unbound.patch" ZGlmZiAtLWdpdCBldGMvTWFrZWZpbGUgZXRjL01ha2VmaWxlCmluZGV4IGFlNTJkNzkuLjVh NmRhYmQgMTAwNjQ0Ci0tLSBldGMvTWFrZWZpbGUKKysrIGV0Yy9NYWtlZmlsZQpAQCAtMjQ3 LDYgKzI0NywxMSBAQCBkaXN0cmlidXRpb246CiAJCWxuIC1zIC4uL3Zhci9uYW1lZC9ldGMv bmFtZWRiICR7REVTVERJUn0vZXRjL25hbWVkYjsgXAogCWZpCiAuZW5kaWYKKy5pZiAke01L X1VOQk9VTkR9ICE9ICJubyIKKwlpZiBbICEgLWUgJHtERVNURElSfS9ldGMvdW5ib3VuZCBd OyB0aGVuIFwKKwkJJHtJTlNUQUxMX1NZTUxJTkt9IC4uL3Zhci91bmJvdW5kICR7REVTVERJ Un0vZXRjL3VuYm91bmQ7IFwKKwlmaQorLmVuZGlmCiAuaWYgJHtNS19CSU5EX0VUQ30gIT0g Im5vIgogCSR7XytffWNkICR7LkNVUkRJUn0vbmFtZWRiOyAke01BS0V9IGluc3RhbGwKIC5l bmRpZgo= --------------040907060502040105050102--