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

diff --git a/modules/debian_org/templates/puppet.conf.erb b/modules/debian_org/templates/puppet.conf.erb
index e0947269e..aa1cae1d2 100644
--- a/modules/debian_org/templates/puppet.conf.erb
+++ b/modules/debian_org/templates/puppet.conf.erb
@@ -9,11 +9,13 @@ vardir=/var/lib/puppet
 ssldir=/var/lib/puppet/ssl
 rundir=/var/run/puppet
 factpath=$vardir/lib/facter
-pluginsync=true
 # This is the default environment for all clients
 environment=production
+<%- if has_variable?("puppetversion") and (scope.call_function('versioncmp', [@puppetversion.to_s, '4.4.0']) < 0) -%>
+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
@@ -24,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 -%>