X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=4408077889f385c7c1c7b223e840d43456c373fa;hb=8c68c6d54aa328ea95126ed5f369039c1d2fff80;hp=ce0cadd254a1dc474f1a97d85e6601aa376d0df4;hpb=3561e0cdfcd7bb773c6431f56409002f632ad083;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index ce0cadd25..440807788 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -125,6 +125,7 @@ file=/etc/exim4/ssl
 file=/etc/apt
 file=/etc/apt/apt.conf.d
 file=/etc/apt/sources.list.d
+file=/etc/apt/preferences.d
 file=/etc/default
 file=/etc/logrotate.d
 file=/etc/nagios
@@ -143,11 +144,12 @@ file=/etc/monit/monit.d
 file=/etc/pam.d
 file=/etc/sysctl.d
 file=/etc/syslog-ng
+file=/etc/stunnel
 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
@@ -323,8 +325,10 @@ file=/etc/apt/sources.list.d/debian.org.list
 file=/etc/apt/sources.list.d/debian.restricted.list
 file=/etc/apt/sources.list.d/debian.list
 file=/etc/apt/sources.list.d/backports.org.list
+file=/etc/apt/apt.conf.d/local-compression
 file=/etc/apt/apt.conf.d/local-recommends
 file=/etc/apt/apt.conf.d/local-pdiffs
+file=/etc/apt/preferences.d/buildd
 file=/etc/puppet/puppet.conf
 file=/etc/default/puppet
 file=/etc/default/postgrey
@@ -359,6 +363,7 @@ file=/usr/lib/nagios/plugins/dsa-check-raid-areca
 file=/usr/lib/nagios/plugins/dsa-check-raid-sw
 file=/usr/lib/nagios/plugins/dsa-update-samhain-status
 file=/etc/sudoers
+file=/etc/stunnel/puppet-ekeyd-peer.pem
 file=/etc/sysctl.d/mmap_min_addr.conf
 file=/etc/pam.d/sudo
 file=/etc/monit/monitrc
@@ -374,6 +379,7 @@ file=/etc/nagios3/puppetconf.d/auto-dependencies.cfg
 file=/etc/nagios3/puppetconf.d/auto-hostextinfo.cfg
 file=/etc/nagios3/puppetconf.d/auto-serviceextinfo.cfg
 file=/etc/nagios3/puppetconf.d/auto-servicegroups.cfg
+file=/etc/nagios3/puppetconf.d/contacts.cfg
 <% end -%>
 <% if nodeinfo['muninmaster'] -%>
 file=/etc/munin/munin.conf
@@ -399,7 +405,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 -%>