Some tweaks to make sure there is a facter directory installed. Why is

this not in the package?
Signed-off-by: Stephen Gran <steve@lobefin.net>

diff --git a/files/etc/puppet/puppet.conf b/files/etc/puppet/puppet.conf
index 01e92a1a60014922c001f09f4eba2522b72ec9d5..1448729e65e7182e3d6d217887e7853c8c5a0102 100644 (file)
--- a/files/etc/puppet/puppet.conf
+++ b/files/etc/puppet/puppet.conf
@@ -3,7 +3,7 @@ logdir=/var/log/puppet
 vardir=/var/lib/puppet
 ssldir=/var/lib/puppet/ssl
 rundir=/var/run/puppet
-factpath=$vardir/lib/facter
+factpath=$vardir/facter
 pluginsync=true
 
 [puppetmasterd]

diff --git a/modules/debian-org/manifests/init.pp b/modules/debian-org/manifests/init.pp
index cfafb9b52eab6dbddd8e29d08f87f1af3eea2eb7..24c90c9bd75ba4549c90c1dac52c81cbb4e80431 100644 (file)
--- a/modules/debian-org/manifests/init.pp
+++ b/modules/debian-org/manifests/init.pp
@@ -59,9 +59,26 @@ class debian-org {
              ensure  => file,
              source => "puppet:///files/etc/puppet/puppet.conf",
              notify  => Exec["puppet reload"];
+      "/var/lib/puppet/facter":
+             ensure  => directory,
+             owner   => root,
+             group   => root,
+             mode    => 755,
+             purge   => true;
    }
    exec { "puppet reload":
              path        => "/etc/init.d:/usr/bin:/usr/sbin:/bin:/sbin",
              refreshonly => true,
    }
 }
+
+class debian-proliant inherits debian-org {
+   file {
+      "/etc/apt/sources.list.d/debian.restricted.list":
+             owner   => root,
+             group   => root,
+             mode    => 644,
+             ensure  => file,
+             source => "puppet:///files/etc/apt/sources.list.d/debian.restricted.list";
+   }
+}

diff --git a/puppet.conf b/puppet.conf
index 58b22ab98a6010e4c20558c453dd393fd4542df9..1448729e65e7182e3d6d217887e7853c8c5a0102 100644 (file)
--- a/puppet.conf
+++ b/puppet.conf
@@ -3,8 +3,8 @@ logdir=/var/log/puppet
 vardir=/var/lib/puppet
 ssldir=/var/lib/puppet/ssl
 rundir=/var/run/puppet
-factpath=$vardir/lib/facter
-pluginsync=false
+factpath=$vardir/facter
+pluginsync=true
 
 [puppetmasterd]
 templatedir=/var/lib/puppet/templates