Merge branch 'master' of ssh://handel.debian.org/srv/puppet.debian.org/git/dsa-puppet

[mirror/dsa-puppet.git] / modules / samhain / templates / samhainrc.erb

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 46f7ae4..c3f4be5 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -90,9 +90,10 @@ file=/var/state/samhain/samhain_file
 file=/etc/bind/zones/db.debian.net
 file=/etc/exim4/bsmtp
 <% if hostname == "geo1" || hostname == "geo2" || hostname == "geo3" -%>
-file=/etc/bind/named.conf.geo
 file=/etc/bind/named.conf.acl
 file=/etc/bind/named.conf.options
+file=/etc/bind/geodns/named.conf.geo.security.debian.org
+file=/etc/bind/geodns/recvconf.files
 file=/etc/bind/geodns/db.security.debian.org.SA
 file=/etc/bind/geodns/db.security.debian.org.OC
 file=/etc/bind/geodns/db.security.debian.org.NA
@@ -125,6 +126,7 @@ file=/etc/default
 file=/etc/logrotate.d
 file=/etc/nagios
 file=/etc/nagios/nrpe.d
+file=/etc/nagios/obsolete-packages-ignore.d
 file=/etc/bind/geodns
 <%= extradir=""
 case fqdn 
@@ -134,15 +136,6 @@ else extradir="file=/etc/puppet"
 end
 extradir
 %>
-<%=
-out=""
-if not nodeinfo['buildd'].empty?
-  out = '
-file=/etc/schroot
-'
-end
-out
-%>
 file=/etc/cron.d
 file=/usr/lib/nagios/plugins
 file=/usr/sbin
@@ -253,15 +246,6 @@ file=/etc/exim4/ssl/thishost.crt
 file=/etc/exim4/ssl/thishost.key
 <%=
 out=""
-if not nodeinfo['buildd'].empty?
-  out = '
-file=/etc/schroot/mount-defaults
-'
-end
-out
-%>
-<%=
-out=""
 if not nodeinfo['heavy_exim'].empty?
   out = '
 file=/etc/exim4/surbl_whitelist.txt
@@ -293,6 +277,7 @@ file=/usr/sbin/dsa-update-samhain-status
 file=/etc/nagios/nrpe.d/nrpe_dsa.cfg
 file=/etc/nagios/nrpe.d/debianorg.cfg
 file=/etc/nagios/obsolete-packages-ignore
+file=/etc/nagios/obsolete-packages-ignore.d/hostspecific
 file=/usr/lib/nagios/plugins/dsa-check-packages
 file=/usr/lib/nagios/plugins/dsa-check-soas
 file=/usr/lib/nagios/plugins/dsa-check-mirrorsync
@@ -316,6 +301,7 @@ file=/etc/pam.d/sudo
 file=/etc/monit/monitrc
 file=/etc/monit/monit.d/01puppet
 file=/etc/monit/monit.d/00debian.org
+file=/etc/cron.d/dsa-puppet-stuff
 <%= extrafiles=""
 case fqdn 
 when "spohr.debian.org": extrafiles="file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg