X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=80a1dc144b793e10de74d2c2ca7d1348dbd18d2e;hb=a1b5a1c81f41292d5a21f4e8762aa0ae9d360679;hp=b2be07aac392f11747ff7bda0a51b379be1fb25a;hpb=25a153ebac03385a69fe864e4e1b017bc63f5777;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index b2be07aac..80a1dc144 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]
 ##
@@ -148,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
@@ -170,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
@@ -185,6 +189,12 @@ file=/etc/rabbitmq
 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
@@ -379,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
@@ -505,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
+dir=10/var/lib/puppet/clientbucket
 
 [IgnoreNone]
 ##
@@ -524,15 +531,24 @@ file=/etc/ssl/private/*.key-certchain
 ## for these files, only access time is ignored
 ##
 dir=/usr/bin
+<%- if has_variable?("merged_usr") && @merged_user -%>
+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_user -%>
+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
 #