From 05a760c0094fda6c23cab7d3b2e03e5a48da4223 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Sat, 28 Feb 2009 22:13:04 +0000 Subject: [PATCH] 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 --- files/etc/default/puppet | 7 +++++++ fileserver.conf | 5 +++-- modules/debian-org/manifests/init.pp | 9 +++++---- 3 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 files/etc/default/puppet diff --git a/files/etc/default/puppet b/files/etc/default/puppet new file mode 100644 index 000000000..3dcfa06cc --- /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 8aab99c29..26219abaa 100644 --- 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 e1369d5fa..7a05fbf96 100644 --- 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", -- 2.20.1