From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 23 Jan 2010 09:15:01 +0000 (+0100)
Subject: Ignore munin.conf on spohr
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=5e0b8afb93e36309a7fe7da8e23d8628cea8aae8;p=mirror%2Fdsa-puppet.git

Ignore munin.conf on spohr
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index fbcdf9c78..005b187be 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -364,7 +364,8 @@ file=/etc/nagios3/puppetconf.d/auto-hosts.cfg
 file=/etc/nagios3/puppetconf.d/auto-services.cfg
 file=/etc/nagios3/puppetconf.d/auto-dependencies.cfg
 file=/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg
-file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg"
+file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg
+file=/etc/munin/munin.conf"
 when "handel.debian.org": extrafiles="dir=8/etc/puppet"
 when "dijkstra.debian.org": extrafiles="dir=4/etc/dsa-kvm"
 when /geo[123].debian.org/: extrafiles="dir=1/etc/bind/geodns"