apparently, puppet is not fond of sloppy line endings

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

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index d0ac184b5b4e4126610fa381bcb6bb454e1c9243..c2007060a9e0382bad7ea5884d6add4485e15280 100644 (file)
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -11,19 +11,19 @@ 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
 
 [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