projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First go at cdbuilder local mirror export (re: RT##7101)
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
2889636
..
161d180
100644
(file)
--- a/
modules/samhain/templates/samhainrc.erb
+++ b/
modules/samhain/templates/samhainrc.erb
@@
-114,6
+114,12
@@
file=/etc/static-clients.conf
file=/etc/apache2/conf-available/puppet-ssl-key-pins.conf
<% end -%>
file=/etc/multipath/wwids
file=/etc/apache2/conf-available/puppet-ssl-key-pins.conf
<% end -%>
file=/etc/multipath/wwids
+<%- if has_variable?("bgpd") && @bgpd -%>
+file=/etc/quagga/bgpd.conf
+<% end -%>
+<%- if has_variable?("zebra") && @zebra -%>
+file=/etc/quagga/zebra.conf
+<% end -%>
#
# There are files in /etc that might change, thus changing the directory
#
# There are files in /etc that might change, thus changing the directory
@@
-179,6
+185,12
@@
file=/etc/rabbitmq
file=/etc/ssh/userkeys
file=/etc/ssh/userkeys/staticsync
<% end -%>
file=/etc/ssh/userkeys
file=/etc/ssh/userkeys/staticsync
<% end -%>
+<% if scope.function_has_role(['ssh.upload.d.o']) -%>
+file=/etc/ssh/userkeys/buildd-uploader
+<% end -%>
+<% if scope.function_has_role(['buildd_master']) -%>
+file=/etc/ssh/userkeys/wb-buildd.more
+<% end -%>
file=/etc/rsyncd
<%- if @hostname == "sibelius" then -%>
file=/etc/tsm
file=/etc/rsyncd
<%- if @hostname == "sibelius" then -%>
file=/etc/tsm
@@
-430,8
+442,6
@@
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/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
@@
-671,9
+681,9
@@
SyslogSeverity=alert
## --- Check the filesystem for SUID/SGID binaries
##
## --- Check the filesystem for SUID/SGID binaries
##
-## Switch o
n
+## Switch o
ff
#
#
-# SuidCheckActive = yes
+SuidCheckActive = 0
## Interval for check (seconds)
#
## Interval for check (seconds)
#
@@
-685,13
+695,7
@@
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)
#