X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=files%2Fetc%2Fpuppet%2Fpuppet.conf;h=a4c7ade2286b7136b90ce377a796632297e22277;hb=723003d289770302c17bd3e89363fabf477110f7;hp=1448729e65e7182e3d6d217887e7853c8c5a0102;hpb=3531cf3f764965f298d08b9e3733bdff51e02c11;p=mirror%2Fdsa-puppet.git

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 1448729e6..a4c7ade22 100644
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -1,10 +1,29 @@
+##
+## 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
-pluginsync=true
+factpath=$vardir/facts
+pluginsync=false
+# This is the default environment for all clients
+environment=production
 
 [puppetmasterd]
-templatedir=/var/lib/puppet/templates
+templatedir=/etc/puppet/templates
+libdir=/etc/puppet/lib
+environments = development,testing,production,staging
+
+[puppetd]
+environments = development,testing,production,staging
+
+[staging]
+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