X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Ftemplates%2Fpuppet.conf.erb;h=d41e2a01a10a9ae47fd4da5e1293fc99087b3cc9;hb=f01ae912798f256491ed13755113bf403cb48e8e;hp=67a4d49e2392f9d6f7dbe143458c16be852aec26;hpb=2eaab21ba472e71a1ed50a45eec4a4bff7e48baa;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/templates/puppet.conf.erb b/modules/debian-org/templates/puppet.conf.erb
index 67a4d49e2..d41e2a01a 100644
--- a/modules/debian-org/templates/puppet.conf.erb
+++ b/modules/debian-org/templates/puppet.conf.erb
@@ -10,27 +10,34 @@ ssldir=/var/lib/puppet/ssl
 rundir=/var/run/puppet
 factpath=$vardir/lib/facter
 pluginsync=true
+modulepath=/etc/puppet/modules:/etc/puppet/3rdparty/modules:/usr/share/puppet/modules
 # This is the default environment for all clients
 environment=production
 
 <%- if scope.lookupvar('::hostname') == 'handel' -%>
 [master]
-environments = development,testing,production,staging
-reports = store, http
-reporturl = http://puppet-dashboard.debian.org:3000/reports/upload
+environments = production,staging
+reports = store
 config_version = cat /etc/puppet/.config-version
 storeconfigs = true
+thin_storeconfigs = true
 dbadapter=mysql
 dbuser=puppet
-dbpassword=Oof0shee6Athoesh
+dbpassword=<%= scope.lookupvar('dbpassword') %>
 dbserver=localhost
 <%- end -%>
 
 [agent]
 environments = development,testing,production,staging
 report = true
+configtimeout = 240
+
+[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
+modulepath=/srv/puppet.debian.org/stages/staging/modules:/srv/puppet.debian.org/stages/staging/3rdparty/modules