lib/phusion_passenger/templates/standalone/config.erb in passenger-3.0.0 vs lib/phusion_passenger/templates/standalone/config.erb in passenger-3.0.1

- old
+ new

@@ -1,5 +1,31 @@ +##################################################### +# +# !!!!!!! WARNING, READ THIS !!!!!!! +# +# +# The fact that Phusion Passenger uses Nginx +# internally is considered to be an implementation +# detail that the user should not bother with. +# We may arbitrarily replace the Nginx core with +# something else in the future. +# +# As such, we do not support any kind of custom +# Nginx configuration in Phusion Passenger Standalone. +# If you need additional Nginx modules or if you need +# special Nginx configuration or whatever then you +# should use Phusion Passenger for Nginx, NOT +# Phusion Passenger Standalone. +# +# You are strongly discouraged from editing this file +# and treating Phusion Passenger Standalone as an easy +# way to start Nginx. We will not provide any support +# for this. +# +##################################################### + + master_process on; worker_processes 1; daemon on; error_log '<%= @options[:log_file] %>'; pid '<%= @options[:pid_file] %>'; @@ -8,21 +34,25 @@ events { worker_connections 1024; } http { - include '<%= nginx_dir %>/conf/mime.types'; - client_body_temp_path '<%= @temp_dir %>/client'; - proxy_temp_path '<%= @temp_dir %>/proxy'; + include '<%= PhusionPassenger::RESOURCES_DIR %>/mime.types'; passenger_ruby <%= PlatformInfo.ruby_command %>; passenger_root '<%= passenger_root %>'; passenger_abort_on_startup_error on; passenger_user_switching off; passenger_max_pool_size <%= @options[:max_pool_size] %>; passenger_min_instances <%= @options[:min_instances] %>; <% if @options[:user] %>passenger_default_user <%= @options[:user] %>;<% end %> + <% if @options[:union_station_gateway_address] %> + union_station_gateway_address <%= @options[:union_station_gateway_address] %>; + union_station_gateway_port <%= @options[:union_station_gateway_port] %>; + union_station_gateway_cert -; + <% end %> + default_type application/octet-stream; client_max_body_size 50m; access_log off; keepalive_timeout 60; gzip on; @@ -53,10 +83,12 @@ root '<%= app[:root] %>/public'; passenger_enabled on; rails_env <%= app[:env] %>; passenger_spawn_method <%= app[:spawn_method] %>; <% if app[:min_instances] %>passenger_min_instances <%= app[:min_instances] %>;<% end %> - <% if app[:analytics] %>passenger_analytics on;<% end %> - <% if app[:debugger] %>passenger_debugger on;<% end %> + <% if app[:union_station_key] %> + passenger_analytics on; + union_station_key <%= app[:union_station_key] %>; + <% end %> } <% end %> }