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 1448729e65e7182e3d6d217887e7853c8c5a0102..7343e3d5f4d96264259572d459734af2721fbf85 100644 (file)
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -1,10 +1,28 @@
+##
+## THIS FILE IS UNDER PUPPET CONTROL. DON'T EDIT IT HERE.
+## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
+##
+
 [main]
 logdir=/var/log/puppet
 vardir=/var/lib/puppet
 ssldir=/var/lib/puppet/ssl
 rundir=/var/run/puppet
-factpath=$vardir/facter
+factpath=$vardir/facts
 pluginsync=true
+# This is the default environment for all clients
+environment=production 
 
 [puppetmasterd]
-templatedir=/var/lib/puppet/templates
+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