From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 6 Feb 2018 09:15:04 +0000 (+0100)
Subject: samhain ignore /etc/ssh/userkeys/buildd-uploader on ssh upload hosts
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=19050b5482fb2b557f1f4498ceef239bdf61570a;p=mirror%2Fdsa-puppet.git

samhain ignore /etc/ssh/userkeys/buildd-uploader on ssh upload hosts
---

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index b2be07aac..4d4742682 100644
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -185,6 +185,9 @@ 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 -%>
 file=/etc/rsyncd
 <%- if @hostname == "sibelius" then -%>
 file=/etc/tsm