templates/passenger_nginx/config/rubber/role/passenger_nginx/nginx.conf in rubber-2.10.2 vs templates/passenger_nginx/config/rubber/role/passenger_nginx/nginx.conf in rubber-2.11.0

- old
+ new

@@ -45,22 +45,23 @@ # default log files error_log <%= rubber_env.nginx_log_dir %>/error.log notice; access_log <%= rubber_env.nginx_log_dir %>/access.log main; - passenger_root <%= rubber_env.passenger_root %>; + passenger_root /usr/lib/ruby/vendor_ruby/phusion_passenger/locations.ini; passenger_ruby <%= rubber_env.passenger_ruby %>; passenger_max_pool_size <%= rubber_env.max_app_connections %>; passenger_min_instances <%= rubber_env.max_app_connections %>; passenger_max_instances_per_app 0; passenger_pool_idle_time 0; passenger_max_preloader_idle_time 0; - rails_env <%= Rubber.env %>; + passenger_app_env <%= Rubber.env %>; passenger_friendly_error_pages <%= Rubber.env == 'production' ? 'off' : 'on' %>; passenger_user <%= rubber_env.app_user %>; - + passenger_group <%= rubber_env.app_user %>; + include /etc/nginx/rubber/passenger_nginx.conf; <% if rubber_instances[rubber_env.host].role_names.include?('web_tools') %> include /etc/nginx/rubber/tools.conf; <% end %> }