X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=files%2Fetc%2Fpuppet%2Fpuppet.conf;h=931ce3ce61ad70a5a9688503752cffc8b173d6c8;hb=b5fb19eb10dd9311ee1bb1af1d93753a895b219d;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..931ce3ce6 100644
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -1,10 +1,16 @@
+##
+## 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
 
 [puppetmasterd]
-templatedir=/var/lib/puppet/templates
+templatedir=/etc/puppet/templates
+libdir=/etc/puppet/lib