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

[mirror/dsa-puppet.git] / files / etc / puppet / puppet.conf

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 1e3776f..c200706 100644 (file)
--- 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