X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=24e6478fdbb19e1e6d18cc9c3df0d1c1756532c5;hb=23f10c8e359298d717decf0da12ec3d6b1907c1f;hp=cff3dc371e93f28b041f18781ba2606d028bd3cb;hpb=2604ef8d8e2e0c04705b0f75fbf86ce54f1da863;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index cff3dc371..24e6478fd 100644
--- 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'] %>
+<% if (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy']) %>
 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'] %>
+<% if (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy']) %>
 file=/etc/unbound/unbound.conf
 <% end -%>
 
@@ -430,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
@@ -842,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
 #