Merge pull request #236 from bryantraywick/bryantraywick-fix-compatib…

…ility-with-older-versions-of-passenger Fix compatibility with older versions of passenger.
railsmachine · Nov 23, 2014 · eab6a0a · eab6a0a
2 parents fee52f8 + 350b4b0
commit eab6a0a
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/lib/moonshine/manifest/rails/templates/passenger.conf.erb b/lib/moonshine/manifest/rails/templates/passenger.conf.erb
@@ -188,10 +188,12 @@ PassengerBufferResponse <%= passenger_config_boolean(configuration[:passenger][:
 
 PassengerFriendlyErrorPages <%= passenger_config_boolean(configuration[:passenger][:friendly_error_pages], false) %>
 
+<% if configuration[:passenger][:start_timeout] %>
 ## PassengerStartTimeout
 # Specifies a timeout for the startup of application processes. If an application process fails to start within the
 # timeout period then it will be forcefully killed with SIGKILL, and the error will be logged.
 PassengerStartTimeout <%= configuration[:passenger][:start_timeout] || '90' %>
+<% end %>
 
 <% if configuration[:passenger][:enterprise] %>