X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Ftemplates%2Fpuppet.conf.erb;h=e0947269eb58052b1ac22c0ff9a74efe9770cf64;hb=69e48f13d90588d81f1513e0e0155008ae82b287;hp=319c47db78c7b0996c5256568c79e0afae0a2611;hpb=374f004e5990003a1d1caa271ddf2bd6c082e4a0;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/templates/puppet.conf.erb b/modules/debian_org/templates/puppet.conf.erb
index 319c47db7..e0947269e 100644
--- a/modules/debian_org/templates/puppet.conf.erb
+++ b/modules/debian_org/templates/puppet.conf.erb
@@ -13,8 +13,7 @@ pluginsync=true
 # This is the default environment for all clients
 environment=production
 
-<%- if scope.lookupvar('::hostname') == 'handel' -%>
-
+<% if scope.function_has_role(['puppetmaster']) %>
 [master]
 environmentpath=/srv/puppet.debian.org/stages
 cadir  = /var/lib/puppet/ssl/ca