X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Ftemplates%2Fpuppet.conf.erb;h=2c41258e6a5d334eb6dc66331064dbcb65568fde;hb=bc485a6440d77df73c2adf03237f0388b5cc028b;hp=82d0546fcb7896fb1c99c91804da76a9c6f52146;hpb=47e66c55978a019774cdbfa777be7bbcec325863;p=mirror%2Fdsa-puppet.git

diff --git a/modules/debian-org/templates/puppet.conf.erb b/modules/debian-org/templates/puppet.conf.erb
index 82d0546fc..2c41258e6 100644
--- a/modules/debian-org/templates/puppet.conf.erb
+++ b/modules/debian-org/templates/puppet.conf.erb
@@ -10,16 +10,17 @@ ssldir=/var/lib/puppet/ssl
 rundir=/var/run/puppet
 factpath=$vardir/lib/facter
 pluginsync=true
-modulepath=/etc/puppet/3rdparty/modules:$modulepath
+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
+environments = production,staging
 reports = store, http
 reporturl = http://puppet-dashboard.debian.org:3000/reports/upload
 config_version = cat /etc/puppet/.config-version
+storeconfigs = true
 thin_storeconfigs = true
 dbadapter=mysql
 dbuser=puppet
@@ -32,7 +33,12 @@ 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