From a809ac280da350f12e10d8adf6c7f47e6f4dfecd Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Thu, 10 Jun 2010 22:50:03 -0300
Subject: Using different vardirs for puppet and puppetmaster

---
 templates/puppet-node.conf.erb | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/templates/puppet-node.conf.erb b/templates/puppet-node.conf.erb
index 96890c4..cf287de 100644
--- 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 %>
-- 
cgit v1.2.3