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
34044c5
..
b737307
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-110,6
+110,9
@@
file=/etc/static-clients.conf
<% elsif classes.include?("roles::static_source") -%>
file=/etc/static-clients.conf
<% end -%>
<% elsif classes.include?("roles::static_source") -%>
file=/etc/static-clients.conf
<% end -%>
+<% if classes.include?("apache2") -%>
+file=/etc/apache2/conf-available/puppet-ssl-key-pins.conf
+<% end -%>
file=/etc/multipath/wwids
#
file=/etc/multipath/wwids
#
@@
-126,9
+129,11
@@
file=/etc/init.d/.depend.start
file=/etc/init.d/.depend.stop
# These are the directories for the files we handle with puppet
file=/etc/init.d/.depend.stop
# These are the directories for the files we handle with puppet
-file=/etc/apache2/conf.d
+<% if classes.include?("apache2") -%>
+file=/etc/apache2/conf-available
files=/etc/apache2/mods-enabled
files=/etc/apache2/sites-available
files=/etc/apache2/mods-enabled
files=/etc/apache2/sites-available
+<% end -%>
file=/etc/bacula
file=/etc/samhain
file=/etc/munin
file=/etc/bacula
file=/etc/samhain
file=/etc/munin
@@
-174,6
+179,13
@@
file=/etc/rabbitmq
file=/etc/ssh/userkeys
file=/etc/ssh/userkeys/staticsync
<% end -%>
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]
##
[LogFiles]
##
@@
-231,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
##
@@
-239,6
+252,8
@@
file=/var/log/syslog
file=/etc/resolv.conf
<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
file=/etc/dupload.conf
file=/etc/resolv.conf
<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
file=/etc/dupload.conf
+file=/etc/buildd/buildd.conf
+file=/etc/sbuild/sbuild.conf
<% end -%>
file=/etc/resolv.conf.pcmcia.save
file=/etc/nologin
<% end -%>
file=/etc/resolv.conf.pcmcia.save
file=/etc/nologin
@@
-374,7
+389,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/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/puppet/puppet.conf
file=/etc/default/puppet
file=/etc/default/postgrey
file=/etc/puppet/puppet.conf
file=/etc/default/puppet
file=/etc/default/postgrey
@@
-411,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
@@
-469,6
+483,7
@@
file=/etc/unbound/unbound.conf
<% if scope.lookupvar('::fqdn') == "draghi.debian.org" -%>
file=/etc/openvpn/deb-mgmt-clients.pool
<% end -%>
<% if scope.lookupvar('::fqdn') == "draghi.debian.org" -%>
file=/etc/openvpn/deb-mgmt-clients.pool
<% end -%>
+file=/etc/rsyncd/debian.secrets
<% if scope.function_has_role(['puppetmaster']) %>
<% if scope.function_has_role(['puppetmaster']) %>
@@
-484,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]
##
@@
-649,7
+665,7
@@
SyslogSeverity=alert
#
#####################################################
#
#####################################################
-
#
[SuidCheck]
+[SuidCheck]
##
## --- Check the filesystem for SUID/SGID binaries
##
##
## --- Check the filesystem for SUID/SGID binaries
##
@@
-668,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)
#
@@
-821,6
+843,11
@@
SyslogSeverity=alert
#
# SetDefault = no
#
# SetDefault = no
+<% if scope.call_function('versioncmp', [@lsbmajdistrelease, '9']) >= 0 -%>
+[PortCheck]
+PortCheckActive=0
+<% end -%>
+
#####################################################
#
#####################################################
#
@@
-926,7
+953,7
@@
SetMailNum = 10
## Recipient (max. 8)
#
## Recipient (max. 8)
#
-SetMailAddress=samhain-reports@<%= fqdn -%>
+SetMailAddress=samhain-reports@<%=
@
fqdn -%>
SetMailRelay = localhost
SetMailRelay = localhost