X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=files%2Fetc%2Fpuppet%2Fpuppet.conf;h=a4c7ade2286b7136b90ce377a796632297e22277;hb=723003d289770302c17bd3e89363fabf477110f7;hp=732dfffc78e2afbe4ed227e566cbad0c0062980d;hpb=f4702fedb73ca0c0d70cc2054a64c4523d26c781;p=mirror%2Fdsa-puppet.git

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 732dfffc7..a4c7ade22 100644
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -9,11 +9,21 @@ vardir=/var/lib/puppet
 ssldir=/var/lib/puppet/ssl
 rundir=/var/run/puppet
 factpath=$vardir/facts
-pluginsync=true
+pluginsync=false
+# This is the default environment for all clients
+environment=production
 
 [puppetmasterd]
 templatedir=/etc/puppet/templates
 libdir=/etc/puppet/lib
+environments = development,testing,production,staging
 
 [puppetd]
 environments = development,testing,production,staging
+
+[staging]
+libdir=/etc/puppet/lib
+manifestdir=/srv/puppet.debian.org/stages/staging/manifests
+templatedir=/srv/puppet.debian.org/stages/staging/templates
+fileserverconfig=/srv/puppet.debian.org/stages/staging/fileserver.conf
+modulepath=/srv/puppet.debian.org/stages/staging/modules