X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=files%2Fetc%2Fpuppet%2Fpuppet.conf;h=1a839469124eb683eca6768b2c8a80e44dee3990;hb=aec97012875f318929294c96bf2193a2690ca1a5;hp=1e3776ffa7e22146ca160076698b17dbdf3f39d4;hpb=2e032de04a6974865e39170a4ba3d167e0acd07f;p=mirror%2Fdsa-puppet.git

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 1e3776ffa..1a8394691 100644
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -10,16 +10,20 @@ ssldir=/var/lib/puppet/ssl
 rundir=/var/run/puppet
 factpath=$vardir/facts
 pluginsync=true
+# 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]
-templatedir=/srv/puppet.debian.org/stages/staging/templates
 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
-manifest=/srv/puppet.debian.org/stages/staging/manifests/site.pp