Merge branch 'master' of git+ssh://puppet.debian.org/srv/puppet.debian.org/git/dsa...

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 931ce3c..732dfff 100644 (file)
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -14,3 +14,6 @@ pluginsync=true
 [puppetmasterd]
 templatedir=/etc/puppet/templates
 libdir=/etc/puppet/lib
+
+[puppetd]
+environments = development,testing,production,staging