X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=2a1fb7d48ce57d4ab4edda6274179ae36aafe7b5;hb=4abd7427e3d571770ec2693ea386d983c66a697e;hp=9baa77e0ae966653536754b196e3c12b0377241f;hpb=2973394f1d5992136dd2388e963690be88ac9346;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 9baa77e0a..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 -%>
 
 
 #
@@ -109,17 +121,16 @@ file=/etc/exim4/ssl
 file=/etc/apt
 file=/etc/apt/apt.conf.d
 file=/etc/apt/sources.list.d
-file=/etc/puppet
 file=/etc/default
 file=/etc/logrotate.d
 file=/etc/nagios
 file=/etc/nagios/nrpe.d
-<% extradir=""
+file=/etc/bind/geodns
+<%= extradir=""
 case fqdn 
 when "spohr.debian.org": extradir="file=/etc/nagios3/puppetconf.d
 file=/etc/puppet"
-when "handel.debian.org": extrafiles="dir=8/etc/puppet"
-default: extrafiles="file=/etc/puppet"
+else extradir="file=/etc/puppet"
 end
 extradir
 %>
@@ -129,6 +140,7 @@ file=/usr/sbin
 file=/etc/monit
 file=/etc/monit/monit.d
 file=/etc/pam.d
+file=/etc/syslog-ng
 
 
 [LogFiles]
@@ -201,6 +213,9 @@ file=/var/lib/misc/ssh-rsa-shadow
 file=/etc/.da-backup.trace
 file=/etc/postfix/debianhosts
 file=/etc/postfix/debianhosts.db
+file=/etc/blkid.tab
+file=/etc/blkid.tab.old
+file=/etc/resolv.conf.dhclient-new
 
 # We handle these files with puppet - please to not be bothering us
 file=/etc/timezone
@@ -227,6 +242,26 @@ file=/etc/exim4/ssl/ca.crt
 file=/etc/exim4/ssl/ca.crl
 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
+file=/etc/exim4/exim_surbl.pl
+file=/etc/exim4/ccTLD.txt
+'
+end
+out
+%>
 file=/etc/apt/preferences
 file=/etc/apt/sources.list.d/volatile.list
 file=/etc/apt/sources.list.d/security.list
@@ -239,8 +274,11 @@ 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
+file=/etc/syslog-ng/syslog-ng.conf
 file=/usr/sbin/dsa-update-apt-status
 file=/usr/sbin/dsa-update-samhain-status
 file=/etc/nagios/nrpe.d/nrpe_dsa.cfg
@@ -266,13 +304,10 @@ file=/usr/lib/nagios/plugins/dsa-check-raid-sw
 file=/usr/lib/nagios/plugins/dsa-update-samhain-status
 file=/etc/sudoers
 file=/etc/pam.d/sudo
-file=/etc/blkid.tab
-file=/etc/blkid.tab.old
 file=/etc/monit/monitrc
 file=/etc/monit/monit.d/01puppet
 file=/etc/monit/monit.d/00debian.org
-file=/etc/resolv.conf.dhclient-new
-<% extrafiles=""
+<%= extrafiles=""
 case fqdn 
 when "spohr.debian.org": extrafiles="file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
 file=/etc/nagios3/puppetconf.d/auto-hosts.cfg
@@ -280,9 +315,9 @@ 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"
-default:
+when "handel.debian.org": extrafiles="dir=8/etc/puppet"
 end
-extradir
+extrafiles
 %>
 
 [IgnoreNone]
@@ -728,7 +763,8 @@ SetMailNum = 10
 SetMailAddress=samhain-reports@debian.org
 
 ## Mail relay (IP address)
-<%out=""
+<%=
+out=""
 if not nodeinfo['smarthost'].empty?
   out = '
 SetMailRelay = localhost