X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fsamhain%2Ftemplates%2Fsamhainrc.erb;h=0faf5ec67706abf130aec67422cf092f3d8767c1;hb=b2a6f14054fb5d39f29be46e49cb456fb5f43b5b;hp=66a39c62a9d8af01c6071f7b6daf689815b3bac3;hpb=bec629e9a4027ecd47a92aa70e768c7b569dc97e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/samhain/templates/samhainrc.erb b/modules/samhain/templates/samhainrc.erb
index 66a39c62a..0faf5ec67 100644
--- 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
@@ -507,9 +507,6 @@ file=/usr/share/puppet-dashboard/public/javascripts/all.js
 dir=1/usr/share/puppet-dashboard/tmp/pids
 <% end -%>
 
-<% if classes.include?("porterbox") %>
-file=/etc/cron.weekly/puppet-mail-big-homedirs
-<% end -%>
 file=/etc/ssl/private/*.key-certchain
 dir=10/var/lib/puppet/clientbucket