X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=files%2Fetc%2Fpuppet%2Fpuppet.conf;h=c2007060a9e0382bad7ea5884d6add4485e15280;hb=251eaef2ab7b45a4089b5a6211040f7be30c7f1e;hp=badb8958dded7852d14d13d865d70b337bc69fe9;hpb=2589bd1318a140fe1ed9c8918d2e89eabf075da4;p=mirror%2Fdsa-puppet.git

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index badb8958d..c2007060a 100644
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -11,11 +11,12 @@ rundir=/var/run/puppet
 factpath=$vardir/facts
 pluginsync=true
 # This is the default environment for all clients
-environment=production 
+environment=production
 
 [puppetmasterd]
 templatedir=/etc/puppet/templates
 libdir=/etc/puppet/lib
+environments = development,testing,production,staging
 
 [puppetd]
 environments = development,testing,production,staging