Use unique names for pg_hba.conf entries

[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 4f6c659..aa1cae1 100644 (file)
--- a/modules/debian_org/templates/puppet.conf.erb
+++ b/modules/debian_org/templates/puppet.conf.erb
@@ -9,39 +9,29 @@ 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.lookupvar('::hostname') == 'handel' -%>
-modulepath=/etc/puppet/modules:/etc/puppet/3rdparty/modules:/usr/share/puppet/modules
-
+<% if classes.include?('puppetmaster') -%>
 [master]
-environments = production,staging
-reports = store
-config_version = cat /etc/puppet/.config-version
+environmentpath=/srv/puppet.debian.org/stages
+cadir  = /var/lib/puppet/ssl/ca
 storeconfigs = true
-thin_storeconfigs = true
-dbadapter=mysql
-dbuser=puppet
-dbpassword=<%= scope.lookupvar('dbpassword') %>
-dbserver=localhost
-
-[production]
-manifestdir=/srv/puppet.debian.org/stages/production/manifests
-fileserverconfig=/srv/puppet.debian.org/stages/production/fileserver.conf
-modulepath=/srv/puppet.debian.org/stages/production/modules:/srv/puppet.debian.org/stages/production/3rdparty/modules
-
-[staging]
-manifestdir=/srv/puppet.debian.org/stages/staging/manifests
-fileserverconfig=/srv/puppet.debian.org/stages/staging/fileserver.conf
-modulepath=/srv/puppet.debian.org/stages/staging/modules:/srv/puppet.debian.org/stages/staging/3rdparty/modules
+storeconfigs_backend = puppetdb
 <%- end -%>
 
 [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 -%>