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

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

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 7343e3d5f4d96264259572d459734af2721fbf85..1a839469124eb683eca6768b2c8a80e44dee3990 100644 (file)
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -16,13 +16,14 @@ 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
-manifestdir=/srv/puppet.debian.org/stages/staging/manifests/
-fileservercfg=/srv/puppet.debian.org/stages/staging/fileserver.conf