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

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index c20f9bff4..16508d343 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -111,6 +111,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 -%>
 
 
@@ -122,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
@@ -152,6 +161,7 @@ file=/etc/monit
 file=/etc/monit/monit.d
 file=/etc/pam.d
 file=/etc/syslog-ng
+file=/etc/ssh
 
 
 [LogFiles]
@@ -235,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
@@ -253,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?
@@ -260,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
@@ -320,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
 %>