From d2fe1dc7ca35fc867eefc935f9ee462b698bd67f Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@fedoraproject.org>
Date: Sat, 15 Nov 2008 06:45:37 +0000
Subject: [PATCH] added munin capabilities to unbound

---
 unbound.munin |  2 +-
 unbound.spec  | 25 +++++++++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/unbound.munin b/unbound.munin
index e3303fa..9056575 100644
--- a/unbound.munin
+++ b/unbound.munin
@@ -4,7 +4,7 @@
 # 
 [unbound*]
 user root
-env.statefile /var/lib/unbound/plugin-state/unbound-state
+env.statefile /var/lib/munin/plugin-state/unbound-state
 env.unbound_conf /etc/unbound/unbound.conf
 env.unbound_control /usr/sbin/unbound-control
 env.spoof_warn 1000
diff --git a/unbound.spec b/unbound.spec
index d9b7ab8..860f94a 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -7,6 +7,7 @@ Url: http://www.nlnetlabs.nl/unbound/
 Source: http://www.unbound.net/downloads/%{name}-%{version}.tar.gz
 Source1: unbound.init
 Source2: unbound.conf
+Source3: unbound.munin
 Group: System Environment/Daemons
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: flex, openssl-devel, ldns-devel >= 1.4.0, libevent-devel
@@ -30,6 +31,15 @@ Unbound is designed as a set of modular components, so that also
 DNSSEC (secure DNS) validation and stub-resolvers (that do not run
 as a server, but are linked into an application) are easily possible.
 
+%package munin
+Summary: Plugin for the munin / munin-node monitoring package
+Group:     System Environment/Daemons
+Requires: munin-node
+Requires: %{name} = %{version}-%{release}
+
+%description munin
+Plugin for the munin / munin-node monitoring package
+
 %package devel
 Summary: Development package that includes the unbound header files
 Group: Development/Libraries
@@ -68,6 +78,10 @@ install -d 0755 %{buildroot}%{_initrddir}
 install -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/unbound
 #overwrite stock unbound.conf with our own
 install -m 0755 %{SOURCE2} %{buildroot}%{_localstatedir}/lib/%{name}
+install -d 0755 %{buildroot}%{_sysconfdir}/munin/plugin-conf.d
+install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/munin/plugin-conf.d/unbound
+install -d 0755 %{buildroot}%{_datadir}/munin/plugins/
+install -m 0755 contrib/unbound_munin_ %{buildroot}%{_datadir}/munin/plugins/unbound
 
 # add symbolic link from /etc/unbound.conf -> /var/unbound/unbound.conf
 
@@ -108,6 +122,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sbindir}/*
 %{_mandir}/*/*
 
+%files munin
+%defattr(-,root,root,-)
+%{_sysconfdir}/munin/plugin-conf.d/unbound
+%{_datadir}/munin/plugins/unbound
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libunbound.so
@@ -148,8 +167,10 @@ fi
 %changelog
 * Fri Nov 14 2008 Paul Wouters <paul@xelerance.com> - 1.1.0-1
 - Updated to version 1.1.0
-- Update unbound.conf's statistics options to work properly
-  for munin
+- Updated unbound.conf's statistics options and remote-control
+  to work properly for munin
+- Added unbound-munin package
+- Generate unbound remote-control  key/certs on first startup
 - Required ldns is now 1.4.0
 
 * Wed Oct 22 2008 Paul Wouters <paul@xelerance.com> - 1.0.2-5