X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=f6829e690aecd67d5f4a59231433994cf3afee64;hb=c7afa6d04e06776ac94206451153d6c0c0572495;hp=018a05ebe25c4eb322f98409a2cec3ef167707db;hpb=249b713a08d35bffb1cd52739be6f5808baa5a5f;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 018a05ebe..f6829e690 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -68,6 +68,7 @@
 # RedefUser0=(no default)
 # RedefUser1=(no default)
 IgnoreMissing=/etc/lvm/archive/.*.vg
+IgnoreMissing=/var/lib/puppet/clientbucket/.*
 
 [Attributes]
 ##
@@ -114,6 +115,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
@@ -142,6 +149,7 @@ file=/etc/munin/plugin-conf.d
 file=/etc/munin/munin-conf.d
 file=/etc/exim4
 file=/etc/exim4/ssl
+file=/etc/exim4/conf.d
 file=/etc/apt
 file=/etc/apt/apt.conf.d
 file=/etc/apt/sources.list.d
@@ -164,6 +172,8 @@ file=/etc/monit
 file=/etc/monit/monit.d
 file=/etc/pam.d
 file=/etc/schroot/default
+file=/etc/schroot/dsa
+file=/etc/schroot/dsa/default-mirror
 file=/etc/schroot/setup.d
 file=/etc/sysctl.d
 file=/etc/syslog-ng
@@ -175,10 +185,16 @@ file=/etc/rc.local
 file=/etc/unbound
 file=/etc/dsa
 file=/etc/rabbitmq
-<% if scope.function_has_role(['static_mirror']) or scope.function_has_role(['static_source']) or scope.function_has_role(['static_master']) -%>
+<% if scope.function_has_role(['static_mirror']) or scope.function_has_role(['static_source']) or classes.include?("roles::static_master")  -%>
 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 classes.include?('roles::buildd_master') -%>
+file=/etc/ssh/userkeys/wb-buildd.more
+<% end -%>
 file=/etc/rsyncd
 <%- if @hostname == "sibelius" then -%>
 file=/etc/tsm
@@ -243,13 +259,14 @@ file=/var/log/syslog
 
 
 [IgnoreAll]
+dir=-1/srv
 ##
 ## for these files, no modifications are reported
 ##
 ## This file might be created or removed by the system sometimes.
 ##
 file=/etc/resolv.conf
-<% if scope.lookupvar('site::nodeinfo')['buildd'] -%>
+<% if classes.include?('roles::buildd') -%>
 file=/etc/dupload.conf
 file=/etc/buildd/buildd.conf
 file=/etc/sbuild/sbuild.conf
@@ -372,15 +389,11 @@ file=/etc/apache2/sites-available/www.debian.org
 file=/etc/apt/preferences
 file=/etc/apt/sources.list.d/volatile.list
 file=/etc/apt/sources.list.d/security.list
-file=/etc/apt/sources.list.d/buildd.list
-file=/etc/apt/sources.list.d/buildd.debian.org.list
-file=/etc/apt/sources.list.d/buildd.debian.org-proposed.list
-file=/etc/apt/sources.list.d/buildd.debian.org-experimental.list
 file=/etc/apt/sources.list.d/geoip.list
 file=/etc/apt/sources.list.d/backports.debian.org.list
 file=/etc/apt/sources.list.d/debian.org.list
 file=/etc/apt/sources.list.d/db.debian.org.list
-file=/etc/apt/sources.list.d/debian.restricted.list
+file=/etc/apt/sources.list.d/db.debian.org.restricted.list
 file=/etc/apt/sources.list.d/debian.list
 file=/etc/apt/sources.list.d/backports.org.list
 file=/etc/apt/apt.conf.d/local-compression
@@ -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/cron.d/dsa-buildd
 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
@@ -450,7 +463,7 @@ file=/etc/nagios3/puppetconf.d/contacts.cfg
 <% if scope.function_has_role(['muninmaster']) -%>
 file=/etc/munin/munin.conf
 <% end -%>
-<% if scope.function_has_role(['puppetmaster']) -%>
+<% if classes.include?('roles::puppetmaster') -%>
 dir=8/etc/puppet
 <% end -%>  
 <% if classes.include?('named::geodns') -%>
@@ -484,7 +497,7 @@ file=/etc/openvpn/deb-mgmt-clients.pool
 file=/etc/rsyncd/debian.secrets
 
 
-<% if scope.function_has_role(['puppetmaster']) %>
+<% if classes.include?('roles::puppetmaster') -%>
 
 # Damn you rails apps and your shoddy packaging
 file=/usr/share/puppet-dashboard/public/stylesheets
@@ -494,10 +507,8 @@ 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 -%>
 file=/etc/ssl/private/*.key-certchain
+dir=10/var/lib/puppet/clientbucket
 
 [IgnoreNone]
 ##
@@ -517,15 +528,24 @@ file=/etc/ssl/private/*.key-certchain
 ## for these files, only access time is ignored
 ##
 dir=/usr/bin
+<%- if has_variable?("merged_usr") && @merged_usr -%>
+file=/bin
+<% else -%>
 dir=/bin
+<% end -%>
 dir=/boot
 #
 # SuSE (old) has the boot init scripts in /sbin/init.d/*, 
 # so we go 3 levels deep
 #
+<%- if has_variable?("merged_usr") && @merged_usr -%>
+file=/lib
+file=/sbin
+<% else -%>
 dir=3/sbin
-dir=/usr/sbin
 dir=/lib
+<% end -%>
+dir=/usr/sbin
 dir=3/usr/lib
 dir=3/usr/share
 #
@@ -663,14 +683,14 @@ SyslogSeverity=alert
 #
 #####################################################
 
-# [SuidCheck]
+[SuidCheck]
 ##
 ## --- Check the filesystem for SUID/SGID binaries
 ## 
 
-## Switch on
+## Switch off
 #
-# SuidCheckActive = yes
+SuidCheckActive = 0
 
 ## Interval for check (seconds)
 #
@@ -835,7 +855,7 @@ SyslogSeverity=alert
 #
 # SetDefault = no
 
-<% if @lsbmajdistrelease >= '9' -%>
+<% if scope.call_function('versioncmp', [@lsbmajdistrelease, '9']) >= 0 -%>
 [PortCheck]
 PortCheckActive=0
 <% end -%>