samhain ignore /etc/ssh/userkeys since we now ship a file under it. Sigh

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

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index c3f4be5..ae92b61 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -90,10 +90,20 @@ 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/geodns/named.conf.geo.security.debian.org
+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
@@ -102,6 +112,14 @@ 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 -%>
 
 
@@ -111,8 +129,10 @@ file=/etc/bind/geodns/db.security.debian.org
 #
 file=/etc
 file=/etc/ssh
+file=/etc/ssh/userkeys
 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
@@ -226,6 +246,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
@@ -244,6 +265,9 @@ 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
+file=/etc/ssh/userkeys/root
 <%=
 out=""
 if not nodeinfo['heavy_exim'].empty?
@@ -251,6 +275,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
@@ -311,6 +337,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
 %>