From: Peter Palfrader <peter@palfrader.org>
Date: Thu, 8 Feb 2018 12:01:00 +0000 (+0100)
Subject: ignore wb-buildd.more on buildd_master role hosts
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=b5b219e3258d2e888e11ec9a48800cd1ba22f9be;p=mirror%2Fdsa-puppet.git

ignore wb-buildd.more on buildd_master role hosts
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 4d4742682..161d18057 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -188,6 +188,9 @@ file=/etc/ssh/userkeys/staticsync
 <% 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