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
75564b1
..
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
@@
-170,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]
##
@@
-235,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
@@
-370,7
+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/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
@@
-407,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
@@
-452,6
+468,7
@@
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=1/etc/ssl/ca-debian
dir=2/etc/ssl/debian
dir=1/etc/ssl/certs
dir=1/etc/ssl/ca-debian
@@
-464,6
+481,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']) %>
@@
-479,6
+497,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]
##
@@
-816,6
+835,11
@@
SyslogSeverity=alert
#
# SetDefault = no
#
# SetDefault = no
+<% if @lsbmajdistrelease >= '9' -%>
+[PortCheck]
+PortCheckActive=0
+<% end -%>
+
#####################################################
#
#####################################################
#
@@
-921,7
+945,7
@@
SetMailNum = 10
## Recipient (max. 8)
#
## Recipient (max. 8)
#
-SetMailAddress=samhain-reports@<%= fqdn -%>
+SetMailAddress=samhain-reports@<%=
@
fqdn -%>
SetMailRelay = localhost
SetMailRelay = localhost