diff options
Diffstat (limited to 'templates/puppetmaster.erb')
| -rw-r--r-- | templates/puppetmaster.erb | 8 |
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 |