From: Peter Palfrader <peter@palfrader.org>
Date: Sat, 5 Mar 2011 12:18:02 +0000 (+0100)
Subject: facts and stuff
X-Git-Url: https://git.adam-barratt.org.uk/?p=mirror%2Fdsa-puppet.git;a=commitdiff_plain;h=940d3d11a64936b17c0fe6012fc99f5779fa5302

facts and stuff
---

diff --git a/fileserver.conf b/fileserver.conf
index 2dc300035..716487678 100644
--- a/fileserver.conf
+++ b/fileserver.conf
@@ -21,6 +21,6 @@
 #  allow *.example.com
 #  deny *.evil.example.com
 #  allow 192.168.0.0/24
-[facts]
-  allow *.debian.org
-  path /etc/puppet/facts
+#[facts]
+#  allow *.debian.org
+#  path /etc/puppet/facts
diff --git a/modules/debian-org/files/puppet.conf b/modules/debian-org/files/puppet.conf
index 477064703..1f5ce44c5 100644
--- a/modules/debian-org/files/puppet.conf
+++ b/modules/debian-org/files/puppet.conf
@@ -8,7 +8,7 @@ logdir=/var/log/puppet
 vardir=/var/lib/puppet
 ssldir=/var/lib/puppet/ssl
 rundir=/var/run/puppet
-factpath=$vardir/facts
+factpath=$vardir/lib/facter
 pluginsync=true
 # This is the default environment for all clients
 environment=production