X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian_org%2Ftemplates%2Fpuppet.conf.erb;h=aa1cae1d24bde20304fd789cb6bc3741153a5f42;hb=f8b10b0e0516ad8e0e0f2cf1ed7ab9fb73922b97;hp=f6616ed6d7c1b0b03f809747784077a9e700f0aa;hpb=7a1fb7dbb49b61b9d949e58ca92774f2d49c4e7e;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian_org/templates/puppet.conf.erb b/modules/debian_org/templates/puppet.conf.erb
index f6616ed6d..aa1cae1d2 100644
--- a/modules/debian_org/templates/puppet.conf.erb
+++ b/modules/debian_org/templates/puppet.conf.erb
@@ -15,7 +15,7 @@ environment=production
 pluginsync=true
 <%- end -%>
 
-<% if scope.function_has_role(['puppetmaster']) %>
+<% if classes.include?('puppetmaster') -%>
 [master]
 environmentpath=/srv/puppet.debian.org/stages
 cadir  = /var/lib/puppet/ssl/ca
@@ -27,9 +27,9 @@ storeconfigs_backend = puppetdb
 environments = development,testing,production,staging
 report = true
 <%- if has_variable?("puppetversion") and (scope.call_function('versioncmp', [@puppetversion.to_s, '4.1.0']) >= 0) -%>
-http_connect_timeout = 10
+http_connect_timeout = 20
 http_read_timeout = 240
-<%- else -%
+<%- else -%>
 configtimeout = 240
 <%- end -%>
 <%- if has_variable?("puppetversion") and @puppetversion.to_s == "3.7.2" -%>