From 9d2e1f795ed699151eab5920495e20c5a371bea1 Mon Sep 17 00:00:00 2001
From: tr <tr@subpage.ch>
Date: Sat, 3 May 2014 20:48:31 +0200
Subject: update the puppetclient puppet.conf to puppetversion > 3.5

---
 files/client/puppet.conf | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/files/client/puppet.conf b/files/client/puppet.conf
index 09b47b1..ab8c552 100644
--- a/files/client/puppet.conf
+++ b/files/client/puppet.conf
@@ -1,25 +1,22 @@
 [main]
-    logdir=/var/log/puppet
-    vardir=/var/lib/puppet
-    rundir=/var/run/puppet
-    
-    ssldir=$vardir/ssl
-    
-    # Where 3rd party plugins and modules are installed
-    libdir = $vardir/lib
-    
-    templatedir=$vardir/templates
-    modulepath=/etc/puppet/modules
-    factpath = $libdir/facter
+	confdir						= /etc/puppet
+	logdir						= /var/log/puppet
+	vardir						= /var/lib/puppet
+	ssldir						= $vardir/ssl
+	rundir						= /var/run/puppet
+	factpath					= $vardir/lib/facter
+	templatedir					= $confdir/templates
+	#certname					= puppetmaster01.example.com
+	#server						= puppet.example.com
+	#user						= pe-puppet
+	#group						= pe-puppet
+	#archive_files				= true
+	#archive_file_server			= puppet.example.com
 
-[puppetd]
-    report=true
-    pluginsync=true
-
-    # Default environment
-    environment = production
-
-    # Development environment
-    [development]
-    modulepath = /etc/puppet/development/modules
-    manifest = /etc/puppet/development/manifests/site.pp
+[agent]
+	report						= true
+	classfile					= $vardir/classes.txt
+	localconfig					= $vardir/localconfig
+	graph						= true
+	pluginsync					= true
+	environment					= production
-- 
cgit v1.2.3