probably break a couple of release dependent templates

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

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 600c05edf9172da91255b95ecab051993781748b..e36f484c7d0fdcdca5ccb7d20b5fd506139f7b63 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -147,9 +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'] %>
+<% unless lsbdistcodename == 'lenny' %>
 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']
@@ -326,6 +328,7 @@ file=/etc/apt/apt.conf.d/local-pdiffs
 file=/etc/puppet/puppet.conf
 file=/etc/default/puppet
 file=/etc/default/postgrey
+file=/etc/default/schroot
 file=/etc/default/syslog-ng
 file=/etc/logrotate.d/exim4-paniclog
 file=/etc/logrotate.d/exim4-base
@@ -396,7 +399,7 @@ 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'] %>
+<% unless lsbdistcodename == 'lenny' %>
 file=/etc/unbound/unbound.conf
 <% end -%>
 
@@ -428,6 +431,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
@@ -840,14 +844,9 @@ SetMailNum = 10
 
 ## Recipient (max. 8)
 #
-SetMailAddress=samhain-reports@debian.org
+SetMailAddress=samhain-reports@<%= fqdn -%>
 
-## Mail relay (IP address)
-<% if nodeinfo['smarthost'].empty? -%>
-SetMailRelay = master.debian.org
-<% else -%>
 SetMailRelay = localhost
-<% end -%>
 
 ## Custom subject format
 #