X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=018a05ebe25c4eb322f98409a2cec3ef167707db;hb=6f2e5fc86e49c12b12eef39fc69e0e810a32c318;hp=0310199f234948a522756f81fddc2328dc2a54d9;hpb=f6279d52e808f5bed212f3a84261e33190c193f2;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 0310199f2..018a05ebe 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -180,7 +180,7 @@ file=/etc/ssh/userkeys
 file=/etc/ssh/userkeys/staticsync
 <% end -%>
 file=/etc/rsyncd
-<%- if hostname == "sibelius" then -%>
+<%- if @hostname == "sibelius" then -%>
 file=/etc/tsm
 file=/etc/tsm/TSM.PWD
 <% end -%>
@@ -424,7 +424,6 @@ file=/usr/lib/nagios/plugins/dsa-update-samhain-status
 file=/etc/sudoers
 file=/etc/stunnel/puppet-ekeyd-peer.pem
 file=/etc/stunnel/puppet-ekeyd.conf
-file=/etc/sysctl.d/mmap_min_addr.conf
 file=/etc/pam.d/sudo
 file=/etc/monit/monitrc
 file=/etc/monit/monit.d/01puppet
@@ -836,6 +835,11 @@ SyslogSeverity=alert
 #
 # SetDefault = no
 
+<% if @lsbmajdistrelease >= '9' -%>
+[PortCheck]
+PortCheckActive=0
+<% end -%>
+
 
 #####################################################
 #
@@ -941,7 +945,7 @@ SetMailNum = 10
 
 ## Recipient (max. 8)
 #
-SetMailAddress=samhain-reports@<%= fqdn -%>
+SetMailAddress=samhain-reports@<%= @fqdn -%>
 
 SetMailRelay = localhost