I probably want to ignore ntp.conf now

[mirror/dsa-puppet.git] / modules / samhain / templates / samhainrc.erb

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index a46a94e..73e79b5 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -89,7 +89,14 @@ 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
+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
+<% end -%>
 
 
 #
@@ -100,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
@@ -113,6 +122,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
@@ -127,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
 
 
@@ -207,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
@@ -229,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?
@@ -236,10 +252,13 @@ 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
 %>
+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
@@ -252,6 +271,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 +281,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
@@ -280,10 +301,12 @@ 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
 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 +316,8 @@ 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"
+when /geo[123].debian.org/: extrafiles="dir=1/etc/bind/geodns"
 end
 extrafiles
 %>