X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=7e59467108318f226636459ccca5dc8280c12f31;hb=3fed891a57e1540d9d0a6e8cd381e51c14faf528;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..7e5946710 100644 --- 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 @@ -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] ##