X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=b2be07aac392f11747ff7bda0a51b379be1fb25a;hb=30d3ea60c1ff398ef4bdb2d37e669d819a757ee9;hp=28896369b14e7c8b31dd4f2420b0d660c18de0fd;hpb=4bac4d66f9f48e24ee82b8d62117e65fa68d7bdb;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 28896369b..b2be07aac 100644
--- 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
+<%- 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
@@ -430,8 +436,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/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
@@ -671,9 +675,9 @@ SyslogSeverity=alert
 ## --- Check the filesystem for SUID/SGID binaries
 ## 
 
-## Switch on
+## Switch off
 #
-# SuidCheckActive = yes
+SuidCheckActive = 0
 
 ## Interval for check (seconds)
 #
@@ -685,13 +689,7 @@ SyslogSeverity=alert
  
 ## 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
-<% end -%>
 
 ## Limit on files per second (0 == no limit)
 #