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 bb436d4512141ee359d3f8382fce1763746f6fa5..e36f484c7d0fdcdca5ccb7d20b5fd506139f7b63 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -147,7 +147,7 @@ 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
@@ -328,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
@@ -398,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 -%>