we should also samhain ignore that file

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

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index a46a94e..2a1fb7d 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -89,7 +89,19 @@ file=/etc/network/run/ifstate
 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/db.security.debian.org.SA
+file=/etc/bind/geodns/db.security.debian.org.OC
+file=/etc/bind/geodns/db.security.debian.org.NA
+file=/etc/bind/geodns/db.security.debian.org.EU
+file=/etc/bind/geodns/db.security.debian.org.AS
+file=/etc/bind/geodns/db.security.debian.org.AN
+file=/etc/bind/geodns/db.security.debian.org.AF
+file=/etc/bind/geodns/db.security.debian.org
+<% end -%>
 
 
 #
@@ -113,6 +125,7 @@ file=/etc/default
 file=/etc/logrotate.d
 file=/etc/nagios
 file=/etc/nagios/nrpe.d
+file=/etc/bind/geodns
 <%= extradir=""
 case fqdn 
 when "spohr.debian.org": extradir="file=/etc/nagios3/puppetconf.d
@@ -231,6 +244,15 @@ 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
@@ -252,6 +274,7 @@ file=/etc/apt/apt.conf.d/local-recommends
 file=/etc/apt/apt.conf.d/local-pdiffs
 file=/etc/puppet/puppet.conf
 file=/etc/default/puppet
+file=/etc/default/postgrey
 file=/etc/logrotate.d/exim4-paniclog
 file=/etc/logrotate.d/exim4-base
 file=/etc/logrotate.d/syslog-ng