Using different vardirs for puppet and puppetmaster

diff --git a/templates/puppet-node.conf.erb b/templates/puppet-node.conf.erb
index 96890c462a07dc390e19927c706638c5dd2fc6da..cf287deed924748961415e25fde0c26cf1c50434 100644 (file)
--- a/templates/puppet-node.conf.erb
+++ b/templates/puppet-node.conf.erb
@@ -1,13 +1,15 @@
 [main]
-logdir=/var/log/puppet
-vardir=/var/lib/puppet
-ssldir=/var/lib/puppet/ssl
-rundir=/var/run/puppet
-factpath=$vardir/lib/facter
-pluginsync=true
+logdir        = /var/log/puppet
+vardir        = /var/lib/puppetmaster
+ssldir        = $vardir/ssl
+rundir        = /var/run/puppet
+factpath      = $vardir/lib/facter
+pluginsync    = true
 
 [puppetd]
-server = puppet.<%= domain %>
-runinterval = <%= puppetd_runinterval %>
-puppetport = 8139
-masterport = <%= puppetmaster_port %>
+vardir        = /var/lib/puppet
+ssldir        = $vardir/ssl
+server        = puppet.<%= domain %>
+runinterval   = <%= puppetd_runinterval %>
+puppetport    = 8139
+masterport    = <%= puppetmaster_port %>