facts and stuff

diff --git a/fileserver.conf b/fileserver.conf
index 2dc3000356fd092c22f5de13d53509d4ea8a29a4..716487678af576ad7e077a83fedef622065585d2 100644 (file)
--- 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 477064703cf10788393bf3450c3277a8a633cfa4..1f5ce44c572ea79c1bd508eba2a5eb1cebbc04c5 100644 (file)
--- 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