Using different vardir for master and agent

diff --git a/templates/puppet/puppet.conf.erb b/templates/puppet/puppet.conf.erb
index ae642de0f6734b4e3c3c10a3ff09514650e86dae..696208309e3aaa88a78b2192d622a9c0dc19c20e 100644 (file)
--- a/templates/puppet/puppet.conf.erb
+++ b/templates/puppet/puppet.conf.erb
@@ -1,12 +1,14 @@
 [main]
-logdir        = /var/log/puppet
 rundir        = /var/run/puppet
+logdir        = /var/log/puppet
+vardir        = /var/lib/puppetmaster
+ssldir        = $vardir/ssl
 factpath      = $vardir/lib/facter
 pluginsync    = true
 
 [master]
 vardir        = /var/lib/puppet
-ssldir        = $vardir/ssl
+templatedir   = $vardir/templates
 autosign      = false
 #storeconfigs  = true
 #dbadapter     = mysql