Merge branch 'master' of lab.maketank.net:puppet_modules/puppet_modules_puppet

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',
   }
 }

templates/puppet.conf.erb

@@ -44,4 +44,4 @@ runinterval=1800
 splay=true
 report=true
 server=<%= scope.lookupvar("puppetmaster_server") %>
-configtimeout=120
+configtimeout=240