added munin plugin + USE flag, small other improvements

(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, unsigned Manifest commit)

3 files changed, 29 insertions, 6 deletions

diff --git a/net-dns/nsd/ChangeLog b/net-dns/nsd/ChangeLog
index 5f97f5db6cb0..c90b0b281206 100644
--- a/net-dns/nsd/ChangeLog
+++ b/net-dns/nsd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-dns/nsd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/ChangeLog,v 1.1 2013/01/30 10:43:01 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/ChangeLog,v 1.2 2013/01/30 17:19:22 wschlich Exp $
+
+*nsd-4.0.0_beta3-r1 (30 Jan 2013)
+
+  30 Jan 2013; Wolfram Schlich <wschlich@gentoo.org> +nsd-4.0.0_beta3-r1.ebuild,
+  -nsd-4.0.0_beta3.ebuild, metadata.xml:
+  added munin plugin + USE flag, small other improvements
 
 *nsd-4.0.0_beta3 (30 Jan 2013)
 
diff --git a/net-dns/nsd/metadata.xml b/net-dns/nsd/metadata.xml
index e16ce939dce9..2879366705cc 100644
--- a/net-dns/nsd/metadata.xml
+++ b/net-dns/nsd/metadata.xml
@@ -24,5 +24,8 @@
 		<flag name='root-server'>Configure NSD as a root server</flag>
 		<flag name='runtime-checks'>Enable runtime checks, this could lead 
 			to a reduced service level</flag>
+		<flag name='munin'>
+			Install a plugin for <pkg>net-analyzer/munin</pkg> to graph
+			statistical data from nsd.</flag>
 	</use>
 </pkgmetadata>
diff --git a/net-dns/nsd/nsd-4.0.0_beta3.ebuild b/net-dns/nsd/nsd-4.0.0_beta3-r1.ebuild
index 627bf052adbd..8633109d9044 100644
--- a/net-dns/nsd/nsd-4.0.0_beta3.ebuild
+++ b/net-dns/nsd/nsd-4.0.0_beta3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/nsd-4.0.0_beta3.ebuild,v 1.1 2013/01/30 10:43:01 wschlich Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/nsd/nsd-4.0.0_beta3-r1.ebuild,v 1.1 2013/01/30 17:19:22 wschlich Exp $
 
 EAPI=4
 
@@ -18,13 +18,14 @@ SRC_URI="http://www.nlnetlabs.nl/downloads/${PN}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="bind8-stats ipv6 libevent minimal-responses mmap +nsec3 ratelimit root-server runtime-checks ssl"
+IUSE="bind8-stats ipv6 libevent minimal-responses mmap munin +nsec3 ratelimit root-server runtime-checks ssl"
 
 RDEPEND="
 	dev-libs/openssl
 	virtual/yacc
 	libevent? ( dev-libs/libevent )
 	ssl? ( dev-libs/openssl )
+	munin? ( net-analyzer/munin )
 "
 DEPEND="
 	${RDEPEND}
@@ -39,11 +40,13 @@ pkg_setup() {
 src_configure() {
 	econf \
 		--enable-largefile \
-		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db \
 		--with-logfile="${EPREFIX}"/var/log/nsd.log \
 		--with-pidfile="${EPREFIX}"/run/nsd/nsd.pid \
+		--with-dbfile="${EPREFIX}"/var/db/nsd/nsd.db \
 		--with-xfrdir="${EPREFIX}"/var/db/nsd \
-		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.db \
+		--with-xfrdfile="${EPREFIX}"/var/db/nsd/xfrd.state \
+		--with-zonelistfile="${EPREFIX}"/var/db/nsd/zone.list \
+		--with-zonesdir="${EPREFIX}"/var/lib/nsd \
 		$(use_enable bind8-stats) \
 		$(use_enable ipv6) \
 		$(use_enable minimal-responses) \
@@ -63,11 +66,22 @@ src_install() {
 
 	newinitd "${FILESDIR}"/nsd.initd nsd
 
-	# database directory, writable by nsd for zone updates and transfers
+	# database directory, writable by nsd for database updates and zone transfers
 	dodir /var/db/nsd
 	fowners nsd:nsd /var/db/nsd
 	fperms 750 /var/db/nsd
 
+	# zones directory, writable by nsd for zone file updates (nsd-control write)
+	dodir /var/lib/nsd
+	fowners nsd:nsd /var/lib/nsd
+	fperms 750 /var/lib/nsd
+
+	# install munin plugin
+	if use munin; then
+		exeinto /usr/libexec/munin/plugins
+		doexe contrib/nsd_munin_
+	fi
+
 	# remove the /run directory that usually resides on tmpfs and is
 	# being taken care of by the nsd init script anyway (checkpath)
 	rm -rf "${D}"/run || die "Failed to remove /run"