X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=16508d3432077b64aeaa52be9fd87a9ca6c52847;hb=824f4a691e00271d4d29ffe85659e377ba66a7fb;hp=a46a94ea5223c69d7c5ce08bc0f1863ba4399a82;hpb=6223d29ea525ff1ef4626af124280d5f10fea746;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index a46a94ea5..16508d343 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -89,7 +89,37 @@ 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/named.conf.local
+file=/etc/bind/geodns/named.conf.geo
+file=/etc/bind/geodns/recvconf.files
+file=/etc/bind/geodns/db.www.debian.org.SA
+file=/etc/bind/geodns/db.www.debian.org.OC
+file=/etc/bind/geodns/db.www.debian.org.NA
+file=/etc/bind/geodns/db.www.debian.org.EU
+file=/etc/bind/geodns/db.www.debian.org.AS
+file=/etc/bind/geodns/db.www.debian.org.AN
+file=/etc/bind/geodns/db.www.debian.org.AF
+file=/etc/bind/geodns/db.www.debian.org
+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
+file=/etc/bind/geodns/db.video.debconf.debian.org.EU
+file=/etc/bind/geodns/db.video.debconf.debian.org.AF
+file=/etc/bind/geodns/db.video.debconf.debian.org.OC
+file=/etc/bind/geodns/db.video.debconf.debian.org.SA
+file=/etc/bind/geodns/db.video.debconf.debian.org.AS
+file=/etc/bind/geodns/db.video.debconf.debian.org.NA
+file=/etc/bind/geodns/db.video.debconf.debian.org.AN
+file=/etc/bind/geodns/db.video.debconf.debian.org
+<% end -%>
 
 
 #
@@ -100,6 +130,7 @@ file=/etc
 file=/etc/ssh
 file=/etc/network/run
 file=/etc/bind/zones
+file=/etc/spamassassin/sa-update-keys
 
 # These are the directories for the files we handle with puppet
 file=/etc/samhain
@@ -113,6 +144,8 @@ 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 
 when "spohr.debian.org": extradir="file=/etc/nagios3/puppetconf.d
@@ -128,6 +161,7 @@ file=/etc/monit
 file=/etc/monit/monit.d
 file=/etc/pam.d
 file=/etc/syslog-ng
+file=/etc/ssh
 
 
 [LogFiles]
@@ -211,6 +245,7 @@ file=/etc/samhain/samhainrc
 file=/etc/munin/munin-node.conf
 file=/etc/userdir-ldap.confc
 file=/etc/exim4/blacklist
+file=/etc/exim4/host_blacklist
 file=/etc/exim4/callout_users
 file=/etc/exim4/exim4.conf
 file=/etc/exim4/grey_users
@@ -229,6 +264,8 @@ file=/etc/exim4/ssl/ca.crt
 file=/etc/exim4/ssl/ca.crl
 file=/etc/exim4/ssl/thishost.crt
 file=/etc/exim4/ssl/thishost.key
+file=/etc/ssh/ssh_config
+file=/etc/ssh/sshd_config
 <%=
 out=""
 if not nodeinfo['heavy_exim'].empty?
@@ -236,6 +273,8 @@ if not nodeinfo['heavy_exim'].empty?
 file=/etc/exim4/surbl_whitelist.txt
 file=/etc/exim4/exim_surbl.pl
 file=/etc/exim4/ccTLD.txt
+file=/etc/clamav-unofficial-sigs.conf
+file=/etc/clamav-unofficial-sigs.dsa.conf
 '
 end
 out
@@ -252,6 +291,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
@@ -261,6 +301,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
@@ -284,6 +325,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
@@ -293,6 +335,7 @@ file=/etc/nagios3/puppetconf.d/auto-dependencies.cfg
 file=/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg
 file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg"
 when "handel.debian.org": extrafiles="dir=8/etc/puppet"
+when "dijkstra.debian.org": extrafiles="dir=4/etc/dsa-kvm"
 end
 extrafiles
 %>