X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fdebian-org%2Ftemplates%2Fpuppet.conf.erb;h=915b83c43dc9f6d8c2cf459ef3498bd9fce55be4;hb=7fcd3b79c6af679888217733c2f2b3772020f677;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..915b83c43 100644
--- a/modules/debian-org/templates/puppet.conf.erb
+++ b/modules/debian-org/templates/puppet.conf.erb
@@ -10,7 +10,7 @@ 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
 
@@ -20,6 +20,7 @@ environments = development,testing,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
@@ -35,4 +36,4 @@ 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
+modulepath=/srv/puppet.debian.org/stages/staging/modules:/srv/puppet.debian.org/stages/staging/3rdparty/modules