projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move incoming mail port handling from exim to the debian_org module
[mirror/dsa-puppet.git]
/
modules
/
debian_org
/
templates
/
puppet.conf.erb
diff --git
a/modules/debian_org/templates/puppet.conf.erb
b/modules/debian_org/templates/puppet.conf.erb
index
319c47d
..
a267867
100644
(file)
--- a/
modules/debian_org/templates/puppet.conf.erb
+++ b/
modules/debian_org/templates/puppet.conf.erb
@@
-9,12
+9,13
@@
vardir=/var/lib/puppet
ssldir=/var/lib/puppet/ssl
rundir=/var/run/puppet
factpath=$vardir/lib/facter
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
# 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.lookupvar('::hostname') == 'handel' -%>
-
+<% if scope.function_has_role(['puppetmaster']) %>
[master]
environmentpath=/srv/puppet.debian.org/stages
cadir = /var/lib/puppet/ssl/ca
[master]
environmentpath=/srv/puppet.debian.org/stages
cadir = /var/lib/puppet/ssl/ca
@@
-25,7
+26,12
@@
storeconfigs_backend = puppetdb
[agent]
environments = development,testing,production,staging
report = true
[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
configtimeout = 240
+<%- end -%>
<%- if has_variable?("puppetversion") and @puppetversion.to_s == "3.7.2" -%>
stringify_facts = false
<%- end -%>
<%- if has_variable?("puppetversion") and @puppetversion.to_s == "3.7.2" -%>
stringify_facts = false
<%- end -%>