try to make staging work, try 2

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

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 67938895a11692c9827325f1b8004db38c38180d..7343e3d5f4d96264259572d459734af2721fbf85 100644 (file)
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -10,6 +10,19 @@ 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
+
+[puppetd]
+environments = development,testing,production,staging
+
+[staging]
+templatedir=/srv/puppet.debian.org/stages/staging/templates
+libdir=/etc/puppet/lib
+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