From 46a7acad8dc286fb4cfef1b3b0de13f00e1ded83 Mon Sep 17 00:00:00 2001
From: Udo Waechter <u.waechter@mysportgroup.de>
Date: Tue, 21 May 2013 16:48:32 +0200
Subject: [PATCH] facter 1.7 has its own fact.d

---
 manifests/common.pp | 24 ++++++++++++++++--------
 manifests/init.pp   |  4 +++-
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/manifests/common.pp b/manifests/common.pp
index cd7a8e7..c84b00f 100644
--- a/manifests/common.pp
+++ b/manifests/common.pp
@@ -5,17 +5,25 @@ class puppet::common ($ensure = 'present') {
       default   => $ensure,
     }
   }
+  $ens_dir = $ensure ? {
+    'present' => 'directory',
+    default   => $ensure,
+  }
+
   $facts_d = '/etc/facter/facts.d'
   File['/etc/facter'] -> File[$facts_d]
 
-  file { ['/etc/facter', $facts_d]:
-    ensure => $ensure ? {
-      'present' => 'directory',
-      default   => $ensure,
-    },
-    mode   => 0755,
-    owner  => root,
-    group  => root,
+  file {
+    [
+      '/etc/facter',
+      $facts_d]:
+      ensure => $ens_dir,
+      mode   => 0755,
+      owner  => root,
+      group  => root;
+
+    "${::puppet_vardir}/exported":
+      ensure => $ens_dir;
   }
 
   # add facter variable to custom facts.
diff --git a/manifests/init.pp b/manifests/init.pp
index 00052b1..d987458 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -74,7 +74,9 @@ class puppet (
     content => template("puppet/puppetd_run.sh.erb"),
     mode    => 0700,
     alias   => "puppetd_run.sh",
-    ensure  => "${ensure}",
+    ensure  => $ensure;
+    "/var/log/puppet":
+    mode => '0755',
   }
 
   case $::kernel {