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

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

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 820dbdbae5771059d32cff24fe580039df2c1b8e..1757345b6612a85e61331c73f21adb65dce6a7e7 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -147,7 +147,10 @@ file=/etc/ferm/
 file=/etc/ferm/conf.d
 file=/etc/ferm/dsa.d
 file=/etc/rc.local
-
+<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
+file=/etc/unbound
+<% end -%>
+file=/etc/dsa
 
 [LogFiles]
 ##
@@ -256,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']
@@ -386,7 +390,6 @@ file=/etc/bind/named.conf.debian-zones
 <% if fqdn == "dijkstra.debian.org" -%>
 dir=4/etc/dsa-kvm
 <% end -%>
-
 <% if nodeinfo['buildd'] -%>
 dir=3/etc/lvm
 <% end -%>
@@ -395,6 +398,9 @@ file=/etc/ferm/conf.d/me.conf
 file=/etc/ferm/conf.d/defs.conf
 file=/etc/ferm/ferm.conf
 dir=2/etc/ssl/debian
+<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
+file=/etc/unbound/unbound.conf
+<% end -%>
 
 [IgnoreNone]
 ##
@@ -424,6 +430,7 @@ dir=3/sbin
 dir=/usr/sbin
 dir=/lib
 dir=3/usr/lib
+dir=3/usr/share
 #
 # RedHat and Debian have the bootinit scripts in /etc/init.d/* or /etc/rc.d/*, 
 #        so we go 3 levels deep there too