X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Ftemplates%2Fpuppet.conf.erb;h=8b7580026b859219837a0973eba81af6ec93b3fd;hb=0d951748b2bf61d20f7c3461a1be276de93a502d;hp=11546ebebfdc5f2037e533268ec9e36ea7151212;hpb=ac80ccf735b0db5fe94f45b41148c5ec918c08d9;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/templates/puppet.conf.erb b/modules/debian-org/templates/puppet.conf.erb
index 11546ebeb..8b7580026 100644
--- a/modules/debian-org/templates/puppet.conf.erb
+++ b/modules/debian-org/templates/puppet.conf.erb
@@ -10,29 +10,35 @@ 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' -%>
+modulepath=/etc/puppet/modules:/etc/puppet/3rdparty/modules:/usr/share/puppet/modules
+
 [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=<%= 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
 <%- end -%>
 
 [agent]
 environments = development,testing,production,staging
 report = true
 configtimeout = 240
-
-[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