X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=73e79b5cbca3dc7b6bbcabeb6e50d1877f787c30;hb=02781aa278d496ab877d4c62c74a68f8ea1a24b5;hp=fab0290d1199b1382c96653d208d13e6c861149e;hpb=e36d200a64fc26350a586a6775526a4dfb7e2855;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index fab0290d1..73e79b5cb 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -90,35 +90,12 @@ 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
 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 -%>
 
 
@@ -130,8 +107,10 @@ 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/apache2/conf.d
 file=/etc/samhain
 file=/etc/munin
 file=/etc/exim4
@@ -159,6 +138,7 @@ file=/usr/sbin
 file=/etc/monit
 file=/etc/monit/monit.d
 file=/etc/pam.d
+file=/etc/sysctl.d
 file=/etc/syslog-ng
 
 
@@ -239,10 +219,12 @@ file=/etc/resolv.conf.dhclient-new
 # We handle these files with puppet - please to not be bothering us
 file=/etc/timezone
 file=/etc/motd.tail
+file=/etc/ntp.conf
 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
@@ -261,6 +243,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?
@@ -274,6 +258,7 @@ file=/etc/clamav-unofficial-sigs.dsa.conf
 end
 out
 %>
+file=/etc/apache2/conf.d/ressource-limits
 file=/etc/apt/preferences
 file=/etc/apt/sources.list.d/volatile.list
 file=/etc/apt/sources.list.d/security.list
@@ -316,6 +301,7 @@ file=/usr/lib/nagios/plugins/dsa-check-raid-areca
 file=/usr/lib/nagios/plugins/dsa-check-raid-sw
 file=/usr/lib/nagios/plugins/dsa-update-samhain-status
 file=/etc/sudoers
+file=/etc/sysctl.d/mmap_min_addr.conf
 file=/etc/pam.d/sudo
 file=/etc/monit/monitrc
 file=/etc/monit/monit.d/01puppet
@@ -331,6 +317,7 @@ 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"
+when /geo[123].debian.org/: extrafiles="dir=1/etc/bind/geodns"
 end
 extrafiles
 %>