summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2010-06-10 22:50:03 -0300
committerSilvio Rhatto <rhatto@riseup.net>2010-06-10 22:50:03 -0300
commita809ac280da350f12e10d8adf6c7f47e6f4dfecd (patch)
tree6544419bc7619052a0a0d12ba67ed9640a781881
parent87f3c8f5ceb42aef1f589639fc4d15ad675136b9 (diff)
downloadpuppet-puppet-a809ac280da350f12e10d8adf6c7f47e6f4dfecd.tar.gz
puppet-puppet-a809ac280da350f12e10d8adf6c7f47e6f4dfecd.tar.bz2
Using different vardirs for puppet and puppetmaster
-rw-r--r--templates/puppet-node.conf.erb22
1 files 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 %>