X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=files%2Fetc%2Fpuppet%2Fpuppet.conf;h=67938895a11692c9827325f1b8004db38c38180d;hb=86250b5800fb2f86539252003d5a67b8c4843f00;hp=58b22ab98a6010e4c20558c453dd393fd4542df9;hpb=8801de25a475c330caab5dea68c19f538dee3c92;p=mirror%2Fdsa-puppet.git

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 58b22ab98..67938895a 100644
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -1,10 +1,15 @@
+##
+## 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