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

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index d0ac184b5..1a8394691 100644
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -16,14 +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
-manifest=/srv/puppet.debian.org/stages/staging/manifests/site.pp
-factpath=/srv/puppet.debian.org/stages/staging/facts
-fileservercfg=/srv/puppet.debian.org/stages/staging/fileserver.conf