summaryrefslogtreecommitdiff
path: root/templates/puppetmaster.erb
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-25 17:00:46 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-25 17:00:46 -0200
commit7113c1868df70181bc8315c3f6ec9a7d1e3fe650 (patch)
treeb916bbe6540d53d3dba054db116210b72e616e16 /templates/puppetmaster.erb
parent7c570f42da2605ba53fcc54741cee7d68f028ab6 (diff)
downloadpuppet-puppet-7113c1868df70181bc8315c3f6ec9a7d1e3fe650.tar.gz
puppet-puppet-7113c1868df70181bc8315c3f6ec9a7d1e3fe650.tar.bz2
Parametrizing more variables
Diffstat (limited to 'templates/puppetmaster.erb')
-rw-r--r--templates/puppetmaster.erb8
1 files changed, 4 insertions, 4 deletions
diff --git a/templates/puppetmaster.erb b/templates/puppetmaster.erb
index b3ce647..750e080 100644
--- a/templates/puppetmaster.erb
+++ b/templates/puppetmaster.erb
@@ -4,8 +4,8 @@
START=yes
# Startup options
-DAEMON_OPTS="<%= puppetmaster_daemon_opts %>"
-<% if puppetmaster_servertype == 'mongrel' %>
+DAEMON_OPTS="<%= daemon_opts %>"
+<% if servertype == 'mongrel' %>
# What server type to run
# Options:
# webrick (default, cannot handle more than ~30 nodes)
@@ -15,11 +15,11 @@ DAEMON_OPTS="<%= puppetmaster_daemon_opts %>"
# mongrel. Requires front-end web-proxy such as
# apache, nginx, or pound)
# See: http://reductivelabs.com/trac/puppet/wiki/UsingMongrel
-SERVERTYPE=<%= puppetmaster_servertype %>
+SERVERTYPE=<%= servertype %>
# How many puppetmaster instances to start? Its pointless to set this
# higher than 1 if you are not using mongrel.
-PUPPETMASTERS=<%= puppetmaster_puppetmasters %>
+PUPPETMASTERS=<%= worker_processes %>
# What port should the puppetmaster listen on (default: 8140). If
# PUPPETMASTERS is set to a number greater than 1, then the port for