projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to samhain ignore /var/lib/puppet/clientbucket
[mirror/dsa-puppet.git]
/
modules
/
samhain
/
templates
/
samhainrc.erb
diff --git
a/modules/samhain/templates/samhainrc.erb
b/modules/samhain/templates/samhainrc.erb
index
018a05e
..
7e59467
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
@@
-243,6
+255,7
@@
file=/var/log/syslog
[IgnoreAll]
[IgnoreAll]
+dir=-1/srv
##
## for these files, no modifications are reported
##
##
## for these files, no modifications are reported
##
@@
-429,10
+442,10
@@
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.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/99builddsourceslist
file=/etc/schroot/setup.d/99porterbox-extra-sources
file=/etc/schroot/setup.d/99porterbox-extra-apt-options
file=/etc/openvswitch/conf.db
file=/etc/schroot/setup.d/99porterbox-extra-sources
file=/etc/schroot/setup.d/99porterbox-extra-apt-options
file=/etc/openvswitch/conf.db
@@
-498,6
+511,7
@@
dir=1/usr/share/puppet-dashboard/tmp/pids
file=/etc/cron.weekly/puppet-mail-big-homedirs
<% end -%>
file=/etc/ssl/private/*.key-certchain
file=/etc/cron.weekly/puppet-mail-big-homedirs
<% end -%>
file=/etc/ssl/private/*.key-certchain
+dir=10/var/lib/puppet/clientbucket
[IgnoreNone]
##
[IgnoreNone]
##
@@
-663,14
+677,14
@@
SyslogSeverity=alert
#
#####################################################
#
#####################################################
-
#
[SuidCheck]
+[SuidCheck]
##
## --- 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)
#
@@
-835,7
+849,7
@@
SyslogSeverity=alert
#
# SetDefault = no
#
# SetDefault = no
-<% if
@lsbmajdistrelease >= '9'
-%>
+<% if
scope.call_function('versioncmp', [@lsbmajdistrelease, '9']) >= 0
-%>
[PortCheck]
PortCheckActive=0
<% end -%>
[PortCheck]
PortCheckActive=0
<% end -%>