Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'stable-3.0'

Conflicts:
	lib/phusion_passenger/standalone/start_command.rb
	resources/templates/standalone/config.erb
  • Loading branch information...
commit 20ed499994e078268b7593b35270c0492c035f22 2 parents 988d20e + f010808
@FooBarWidget FooBarWidget authored
View
4 lib/phusion_passenger/standalone/start_command.rb
@@ -156,6 +156,10 @@ def parse_my_options
wrap_desc("Enable rolling restarts (Enterprise only)")) do
@options[:rolling_restarts] = true
end
+ opts.on("--resist-deployment-errors",
+ wrap_desc("Enable deployment error resistance (Enterprise only)")) do
+ @options[:resist_deployment_errors] = true
+ end
opts.on("--union-station-gateway HOST:PORT", String,
wrap_desc("Specify Union Station Gateway host and port")) do |value|
host, port = value.split(":", 2)
View
1  resources/templates/standalone/config.erb
@@ -47,6 +47,7 @@ http {
<% if @options[:user] %>passenger_default_user <%= @options[:user] %>;<% end %>
<% if debugging? %>passenger_log_level 2;<% end %>
<% if @options[:rolling_restarts] %>passenger_rolling_restarts on;<% end %>
+ <% if @options[:resist_deployment_errors] %>passenger_resist_deployment_errors on;<% end %>
<% if @options[:union_station_gateway_address] %>
union_station_gateway_address <%= @options[:union_station_gateway_address] %>;
Please sign in to comment.
Something went wrong with that request. Please try again.