X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=78fad9c146d40acecb97d472721884e8c8d4db7c;hb=3a8d50d01fcd8639ed429909aead5ff8c002fe10;hp=e9ce52fcc6c93855154193ab56dd2d3440df25af;hpb=4361f9fa74905433cc049f8926d77ac17d1d8ce8;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index e9ce52fcc..78fad9c14 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -89,7 +89,20 @@ 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.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
+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 +126,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
@@ -285,6 +299,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