tell puppet that we have a staging branch

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

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 58b22ab98a6010e4c20558c453dd393fd4542df9..732dfffc78e2afbe4ed227e566cbad0c0062980d 100644 (file)
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -1,10 +1,19 @@
+##
+## 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/lib/facter
-pluginsync=false
+factpath=$vardir/facts
+pluginsync=true
 
 [puppetmasterd]
-templatedir=/var/lib/puppet/templates
+templatedir=/etc/puppet/templates
+libdir=/etc/puppet/lib
+
+[puppetd]
+environments = development,testing,production,staging