X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=7e59467108318f226636459ccca5dc8280c12f31;hb=3fed891a57e1540d9d0a6e8cd381e51c14faf528;hp=ddc9e3861e7644eb7374dc68f33b5cacdefccd80;hpb=05bfa391748bf827189c42c1a79694ca4cef28c3;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index ddc9e3861..7e5946710 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
@@ -179,6 +185,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
@@ -499,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]
 ##