projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
ee11c51
..
018a05e
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-110,6
+110,10
@@
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
#
# There are files in /etc that might change, thus changing the directory
#
# There are files in /etc that might change, thus changing the directory
@@
-120,11
+124,16
@@
file=/etc/ssh
file=/etc/network/run
file=/etc/bind/zones
file=/etc/spamassassin/sa-update-keys
file=/etc/network/run
file=/etc/bind/zones
file=/etc/spamassassin/sa-update-keys
+file=/etc/init.d/.depend.boot
+file=/etc/init.d/.depend.start
+file=/etc/init.d/.depend.stop
# These are the directories for the files we handle with puppet
# 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
@@
-155,6
+164,7
@@
file=/etc/monit
file=/etc/monit/monit.d
file=/etc/pam.d
file=/etc/schroot/default
file=/etc/monit/monit.d
file=/etc/pam.d
file=/etc/schroot/default
+file=/etc/schroot/setup.d
file=/etc/sysctl.d
file=/etc/syslog-ng
file=/etc/stunnel
file=/etc/sysctl.d
file=/etc/syslog-ng
file=/etc/stunnel
@@
-169,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]
##
@@
-234,6
+251,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
@@
-250,6
+269,7
@@
file=/etc/blkid.tab.old
file=/etc/resolv.conf.dhclient-new
# We handle these files with puppet - please to not be bothering us
file=/etc/resolv.conf.dhclient-new
# We handle these files with puppet - please to not be bothering us
+file=/etc/dsa/pubsub.conf
file=/etc/nsswitch.conf
file=/etc/timezone
file=/etc/motd.tail
file=/etc/nsswitch.conf
file=/etc/timezone
file=/etc/motd.tail
@@
-290,6
+310,7
@@
file=/etc/aliases
file=/etc/multipath.conf
file=/etc/static-components.conf
file=/etc/rabbitmq/rabbitmq.config
file=/etc/multipath.conf
file=/etc/static-components.conf
file=/etc/rabbitmq/rabbitmq.config
+file=/etc/rabbitmq/enabled_plugins
dir=/etc/bacula/storages-list.d
dir=/etc/bacula/storage-conf.d
dir=/etc/bacula/conf.d
dir=/etc/bacula/storages-list.d
dir=/etc/bacula/storage-conf.d
dir=/etc/bacula/conf.d
@@
-365,6
+386,7
@@
file=/etc/apt/sources.list.d/backports.org.list
file=/etc/apt/apt.conf.d/local-compression
file=/etc/apt/apt.conf.d/local-recommends
file=/etc/apt/apt.conf.d/local-pdiffs
file=/etc/apt/apt.conf.d/local-compression
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/puppet/puppet.conf
file=/etc/default/puppet
file=/etc/apt/preferences.d/buildd
file=/etc/puppet/puppet.conf
file=/etc/default/puppet
@@
-380,6
+402,7
@@
file=/etc/nagios/nrpe.d/nrpe_dsa.cfg
file=/etc/nagios/nrpe.d/debianorg.cfg
file=/etc/nagios/obsolete-packages-ignore
file=/etc/nagios/obsolete-packages-ignore.d/hostspecific
file=/etc/nagios/nrpe.d/debianorg.cfg
file=/etc/nagios/obsolete-packages-ignore
file=/etc/nagios/obsolete-packages-ignore.d/hostspecific
+file=/etc/nagios/check-libs.conf
file=/usr/lib/nagios/plugins/dsa-check-packages
file=/usr/lib/nagios/plugins/dsa-check-soas
file=/usr/lib/nagios/plugins/dsa-check-mirrorsync
file=/usr/lib/nagios/plugins/dsa-check-packages
file=/usr/lib/nagios/plugins/dsa-check-soas
file=/usr/lib/nagios/plugins/dsa-check-mirrorsync
@@
-401,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/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/pam.d/sudo
file=/etc/monit/monitrc
file=/etc/monit/monit.d/01puppet
@@
-411,6
+433,9
@@
file=/etc/cron.d/dsa-buildd
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
+file=/etc/schroot/setup.d/99porterbox-extra-sources
+file=/etc/schroot/setup.d/99porterbox-extra-apt-options
+file=/etc/openvswitch/conf.db
<% if scope.function_has_role(['nagiosmaster']) -%>
file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
<% if scope.function_has_role(['nagiosmaster']) -%>
file=/etc/nagios3/puppetconf.d/auto-hostgroups.cfg
@@
-443,13
+468,20
@@
dir=3/etc/facter
file=/etc/ferm/conf.d/me.conf
file=/etc/ferm/conf.d/defs.conf
file=/etc/ferm/ferm.conf
file=/etc/ferm/conf.d/me.conf
file=/etc/ferm/conf.d/defs.conf
file=/etc/ferm/ferm.conf
+file=/etc/ssl/README
dir=2/etc/ssl/debian
dir=1/etc/ssl/certs
dir=2/etc/ssl/debian
dir=1/etc/ssl/certs
-dir=1/etc/ssl/servicecerts
+dir=1/etc/ssl/ca-debian
+dir=1/etc/ssl/ca-global
+file=/etc/ca-certificates.conf
+file=/etc/ca-certificates-debian.conf
+file=/etc/ca-certificates-global.conf
+file=/etc/ssl/private/ssl-cert-snakeoil.key
file=/etc/unbound/unbound.conf
<% if scope.lookupvar('::fqdn') == "draghi.debian.org" -%>
file=/etc/openvpn/deb-mgmt-clients.pool
<% end -%>
file=/etc/unbound/unbound.conf
<% 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']) %>
@@
-459,11
+491,13
@@
file=/usr/share/puppet-dashboard/public/stylesheets
file=/usr/share/puppet-dashboard/public/javascripts
file=/usr/share/puppet-dashboard/public/stylesheets/all.css
file=/usr/share/puppet-dashboard/public/javascripts/all.js
file=/usr/share/puppet-dashboard/public/javascripts
file=/usr/share/puppet-dashboard/public/stylesheets/all.css
file=/usr/share/puppet-dashboard/public/javascripts/all.js
+dir=1/usr/share/puppet-dashboard/tmp/pids
<% end -%>
<% if classes.include?("porterbox") %>
file=/etc/cron.weekly/puppet-mail-big-homedirs
<% end -%>
<% end -%>
<% if classes.include?("porterbox") %>
file=/etc/cron.weekly/puppet-mail-big-homedirs
<% end -%>
+file=/etc/ssl/private/*.key-certchain
[IgnoreNone]
##
[IgnoreNone]
##
@@
-801,6
+835,11
@@
SyslogSeverity=alert
#
# SetDefault = no
#
# SetDefault = no
+<% if @lsbmajdistrelease >= '9' -%>
+[PortCheck]
+PortCheckActive=0
+<% end -%>
+
#####################################################
#
#####################################################
#
@@
-906,7
+945,7
@@
SetMailNum = 10
## Recipient (max. 8)
#
## Recipient (max. 8)
#
-SetMailAddress=samhain-reports@<%= fqdn -%>
+SetMailAddress=samhain-reports@<%=
@
fqdn -%>
SetMailRelay = localhost
SetMailRelay = localhost