summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2013-01-18 18:54:14 -0200
committerSilvio Rhatto <rhatto@riseup.net>2013-01-18 18:54:14 -0200
commit0c0720ebfeb9aa3b7653b4b9b94d04634c9e3c30 (patch)
treeff320ff025daba4c33ec0fda1a7929dabefd3a99 /templates
parent9cca869888cb1d2eee6b9ca6e6e735993b04cd6f (diff)
downloadpuppet-puppet-0c0720ebfeb9aa3b7653b4b9b94d04634c9e3c30.tar.gz
puppet-puppet-0c0720ebfeb9aa3b7653b4b9b94d04634c9e3c30.tar.bz2
Adding passenger support
Diffstat (limited to 'templates')
-rw-r--r--templates/puppetmaster.erb3
1 files changed, 2 insertions, 1 deletions
diff --git a/templates/puppetmaster.erb b/templates/puppetmaster.erb
index 2ae5f11..b3ce647 100644
--- a/templates/puppetmaster.erb
+++ b/templates/puppetmaster.erb
@@ -5,7 +5,7 @@ START=yes
# Startup options
DAEMON_OPTS="<%= puppetmaster_daemon_opts %>"
-
+<% if puppetmaster_servertype == 'mongrel' %>
# What server type to run
# Options:
# webrick (default, cannot handle more than ~30 nodes)
@@ -34,3 +34,4 @@ PUPPETMASTERS=<%= puppetmaster_puppetmasters %>
# port 8140 and change the below number to something else, such as
# 18140.
PORT=<%= puppetmaster_port %>
+<% end %>