X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=2a1fb7d48ce57d4ab4edda6274179ae36aafe7b5;hb=d71e88d7baa68ad05df910ac57bd7167806cec37;hp=02c43928c0c340b5c3ed26b58e2673f16bb80429;hpb=14db07797701c9487e9ff44b899f2653ed4daec5;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 02c43928c..2a1fb7d48 100644
--- 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,7 +125,7 @@ file=/etc/default
 file=/etc/logrotate.d
 file=/etc/nagios
 file=/etc/nagios/nrpe.d
-file=/etc/powerdns
+file=/etc/bind/geodns
 <%= extradir=""
 case fqdn 
 when "spohr.debian.org": extradir="file=/etc/nagios3/puppetconf.d
@@ -232,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
@@ -286,7 +307,6 @@ file=/etc/pam.d/sudo
 file=/etc/monit/monitrc
 file=/etc/monit/monit.d/01puppet
 file=/etc/monit/monit.d/00debian.org
-file=/etc/powerdns/ip2iso
 <%= extrafiles=""
 case fqdn 
 when "spohr.debian.org": extrafiles="file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg