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 16508d3..ae92b61 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -90,6 +90,7 @@ 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
@@ -128,6 +129,7 @@ file=/etc/bind/geodns/db.video.debconf.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
@@ -161,7 +163,6 @@ file=/etc/monit
 file=/etc/monit/monit.d
 file=/etc/pam.d
 file=/etc/syslog-ng
-file=/etc/ssh
 
 
 [LogFiles]
@@ -266,6 +267,7 @@ 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?