Merge remote-tracking branch 'origin/master' into staging

[mirror/dsa-puppet.git] / modules / samhain / templates / samhainrc.erb

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index b2be07a..161d180 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -185,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