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

diff --git a/modules/debian_org/templates/puppet.conf.erb b/modules/debian_org/templates/puppet.conf.erb
index 83d06dec2..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
@@ -26,7 +26,12 @@ storeconfigs_backend = puppetdb
 [agent]
 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 = 20
+http_read_timeout = 240
+<%- else -%>
 configtimeout = 240
+<%- end -%>
 <%- if has_variable?("puppetversion") and @puppetversion.to_s == "3.7.2" -%>
 stringify_facts = false
 <%- end -%>