From 74d635a25313b0af0a8ebc950d74356231ba37bd Mon Sep 17 00:00:00 2001
From: do <do@maketank.net>
Date: Sun, 26 May 2013 13:38:37 +0200
Subject: [PATCH] longer config retrieval and FACTERLIB var

---
 manifests/common.pp       | 1 -
 templates/puppet.conf.erb | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/manifests/common.pp b/manifests/common.pp
index c84b00f..fcd4e95 100644
--- a/manifests/common.pp
+++ b/manifests/common.pp
@@ -29,6 +29,5 @@ class puppet::common ($ensure = 'present') {
   # add facter variable to custom facts.
   file { "/etc/profile.d/puppet.sh":
     content => "export FACTERLIB=\"${factpath}\"\n",
-    ensure  => 'absent',
   }
 }
diff --git a/templates/puppet.conf.erb b/templates/puppet.conf.erb
index 8a70105..e523034 100644
--- a/templates/puppet.conf.erb
+++ b/templates/puppet.conf.erb
@@ -44,4 +44,4 @@ runinterval=1800
 splay=true
 report=true
 server=<%= scope.lookupvar("puppetmaster_server") %>
-configtimeout=120
+configtimeout=240