projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
99porterbox-extra-sources: use jessie-kfreebsd as base for jessie-backports kfreebsd...
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
86210af
..
b737307
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-180,10
+180,11
@@
file=/etc/ssh/userkeys
file=/etc/ssh/userkeys/staticsync
<% end -%>
file=/etc/rsyncd
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 -%>
file=/etc/tsm
file=/etc/tsm/TSM.PWD
<% end -%>
+file=/etc/ssl/private
[LogFiles]
[LogFiles]
@@
-242,6
+243,7
@@
file=/var/log/syslog
[IgnoreAll]
[IgnoreAll]
+dir=-1/srv
##
## for these files, no modifications are reported
##
##
## for these files, no modifications are reported
##
@@
-423,13
+425,13
@@
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/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
file=/etc/monit/monit.d/00debian.org
file=/etc/cron.d/dsa-puppet-stuff
file=/etc/cron.d/dsa-buildd
file=/etc/pam.d/sudo
file=/etc/monit/monitrc
file=/etc/monit/monit.d/01puppet
file=/etc/monit/monit.d/00debian.org
file=/etc/cron.d/dsa-puppet-stuff
file=/etc/cron.d/dsa-buildd
+file=/etc/cron.d/puppet-nagios-wraps
file=/etc/cron.weekly/stunnel-ekey-restart
file=/etc/default/schroot
file=/etc/schroot/default/nssdatabases
file=/etc/cron.weekly/stunnel-ekey-restart
file=/etc/default/schroot
file=/etc/schroot/default/nssdatabases
@@
-497,6
+499,7
@@
dir=1/usr/share/puppet-dashboard/tmp/pids
<% if classes.include?("porterbox") %>
file=/etc/cron.weekly/puppet-mail-big-homedirs
<% end -%>
<% if classes.include?("porterbox") %>
file=/etc/cron.weekly/puppet-mail-big-homedirs
<% end -%>
+file=/etc/ssl/private/*.key-certchain
[IgnoreNone]
##
[IgnoreNone]
##
@@
-662,7
+665,7
@@
SyslogSeverity=alert
#
#####################################################
#
#####################################################
-
#
[SuidCheck]
+[SuidCheck]
##
## --- Check the filesystem for SUID/SGID binaries
##
##
## --- Check the filesystem for SUID/SGID binaries
##
@@
-681,7
+684,13
@@
SyslogSeverity=alert
## Directory to exclude
#
## Directory to exclude
#
+<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
+SuidCheckExclude = /srv/buildd/unpack
+<% elsif scope.lookupvar('site::nodeinfo')['porterbox'] -%>
+SuidCheckExclude = /srv/chroot/schroot-unpack
+<% else -%>
# SuidCheckExclude = NULL
# SuidCheckExclude = NULL
+<% end -%>
## Limit on files per second (0 == no limit)
#
## Limit on files per second (0 == no limit)
#
@@
-834,6
+843,11
@@
SyslogSeverity=alert
#
# SetDefault = no
#
# SetDefault = no
+<% if scope.call_function('versioncmp', [@lsbmajdistrelease, '9']) >= 0 -%>
+[PortCheck]
+PortCheckActive=0
+<% end -%>
+
#####################################################
#
#####################################################
#
@@
-939,7
+953,7
@@
SetMailNum = 10
## Recipient (max. 8)
#
## Recipient (max. 8)
#
-SetMailAddress=samhain-reports@<%= fqdn -%>
+SetMailAddress=samhain-reports@<%=
@
fqdn -%>
SetMailRelay = localhost
SetMailRelay = localhost