puppet 4 foo

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

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 7bbf678..018a05e 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -180,6 +180,12 @@ file=/etc/ssh/userkeys
 file=/etc/ssh/userkeys/staticsync
 <% end -%>
 file=/etc/rsyncd
+<%- if @hostname == "sibelius" then -%>
+file=/etc/tsm
+file=/etc/tsm/TSM.PWD
+<% end -%>
+file=/etc/ssl/private
+
 
 [LogFiles]
 ##
@@ -382,8 +388,6 @@ file=/etc/apt/apt.conf.d/local-recommends
 file=/etc/apt/apt.conf.d/local-pdiffs
 file=/etc/apt/apt.conf.d/local-ssl-ca-global
 file=/etc/apt/preferences.d/buildd
-file=/etc/systemd/system/puppet.service
-file=/etc/systemd/system/proc-sys-fs-binfmt_misc.automount
 file=/etc/puppet/puppet.conf
 file=/etc/default/puppet
 file=/etc/default/postgrey
@@ -420,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
@@ -494,6 +497,7 @@ dir=1/usr/share/puppet-dashboard/tmp/pids
 <% if classes.include?("porterbox") %>
 file=/etc/cron.weekly/puppet-mail-big-homedirs
 <% end -%>
+file=/etc/ssl/private/*.key-certchain
 
 [IgnoreNone]
 ##
@@ -831,6 +835,11 @@ SyslogSeverity=alert
 #
 # SetDefault = no
 
+<% if @lsbmajdistrelease >= '9' -%>
+[PortCheck]
+PortCheckActive=0
+<% end -%>
+
 
 #####################################################
 #
@@ -936,7 +945,7 @@ SetMailNum = 10
 
 ## Recipient (max. 8)
 #
-SetMailAddress=samhain-reports@<%= fqdn -%>
+SetMailAddress=samhain-reports@<%= @fqdn -%>
 
 SetMailRelay = localhost