So, this works slightly differently than I had thought. In addition to

the server serving facts, the client has to actually request them as
well.  This commit sets up /etc/default/puppet so that clients do
request new facts, as well as setting up fileserver.conf so that clients
are allowed to retrieve new facts.
Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/files/etc/default/puppet b/files/etc/default/puppet
new file mode 100644 (file)
index 0000000..3dcfa06
--- /dev/null
+++ b/files/etc/default/puppet
@@ -0,0 +1,7 @@
+# Defaults for puppet - sourced by /etc/init.d/puppet
+
+# Start puppet on boot?
+START=yes
+
+# Startup options
+DAEMON_OPTS="-w 5 --factsync"

diff --git a/fileserver.conf b/fileserver.conf
index 8aab99c29758412053c306a3e9ca1138db0b2a89..26219abaae326a9a39c657db6dcb808a1024075d 100644 (file)
--- a/fileserver.conf
+++ b/fileserver.conf
@@ -12,9 +12,10 @@
 #  allow 192.168.0.0/24
 
 [plugins]
+  allow *.debian.org
 #  allow *.example.com
 #  deny *.evil.example.com
 #  allow 192.168.0.0/24
 [facts]
-   path /etc/puppet/facts
-
+  allow *.debian.org
+  path /var/lib/puppet/facts

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index e1369d5fa7521ad497ba08b1135a36820730e600..7a05fbf966a69751c6af539e951f24f8a1693716 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -59,12 +59,13 @@ class debian-org {
              ensure  => file,
              source => "puppet:///files/etc/puppet/puppet.conf",
              notify  => Exec["puppet reload"];
-      "/var/lib/puppet/facts":
-             ensure  => directory,
+      "/etc/default/puppet":
              owner   => root,
              group   => root,
-             mode    => 755,
-             purge   => true;
+             mode    => 644,
+             ensure  => file,
+             source => "puppet:///files/etc/default/puppet",
+             notify  => Exec["puppet reload"];
    }
    exec { "puppet reload":
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",