store ssh auth key snippets for buildd wb and upload access, but do not collect just yet

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

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 80a1dc1..fc134cf 100644 (file)
--- a/modules/samhain/templates/samhainrc.erb
+++ b/modules/samhain/templates/samhainrc.erb
@@ -192,7 +192,7 @@ 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']) -%>
+<% if classes.include?('roles::buildd_master') -%>
 file=/etc/ssh/userkeys/wb-buildd.more
 <% end -%>
 file=/etc/rsyncd
@@ -463,7 +463,7 @@ file=/etc/nagios3/puppetconf.d/contacts.cfg
 <% if scope.function_has_role(['muninmaster']) -%>
 file=/etc/munin/munin.conf
 <% end -%>
-<% if scope.function_has_role(['puppetmaster']) -%>
+<% if classes.include?('roles::puppetmaster') -%>
 dir=8/etc/puppet
 <% end -%>  
 <% if classes.include?('named::geodns') -%>
@@ -497,7 +497,7 @@ file=/etc/openvpn/deb-mgmt-clients.pool
 file=/etc/rsyncd/debian.secrets
 
 
-<% if scope.function_has_role(['puppetmaster']) %>
+<% if classes.include?('roles::puppetmaster') -%>
 
 # Damn you rails apps and your shoddy packaging
 file=/usr/share/puppet-dashboard/public/stylesheets
@@ -531,7 +531,7 @@ dir=10/var/lib/puppet/clientbucket
 ## for these files, only access time is ignored
 ##
 dir=/usr/bin
-<%- if has_variable?("merged_usr") && @merged_user -%>
+<%- if has_variable?("merged_usr") && @merged_usr -%>
 file=/bin
 <% else -%>
 dir=/bin
@@ -541,7 +541,7 @@ dir=/boot
 # SuSE (old) has the boot init scripts in /sbin/init.d/*, 
 # so we go 3 levels deep
 #
-<%- if has_variable?("merged_usr") && @merged_user -%>
+<%- if has_variable?("merged_usr") && @merged_usr -%>
 file=/lib
 file=/sbin
 <% else -%>