Merge branch 'master' of ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet

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

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 19e6d4d..1757345 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -150,6 +150,7 @@ file=/etc/rc.local
 <% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
 file=/etc/unbound
 <% end -%>
+file=/etc/dsa
 
 [LogFiles]
 ##
@@ -258,6 +259,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/dsa/cron.ignore.dsa-puppet-stuff
 <%=
 out=""
 if nodeinfo['heavy_exim']