nginx.conf in rubber-2.10.0

- old
+ new

@@ -7,10 +7,13 @@
 worker_processes 4;
 worker_rlimit_nofile 10240;
 
 pid /var/run/nginx.pid;
 
+# Preserve the system path (needed for things like imagemagick + ghostscript)
+env PATH;
+
 events
 {
   worker_connections 8192;
 }
 
@@ -42,23 +45,22 @@
 
   # 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_ruby <%= rubber_env.passenger_ruby %>;
+  passenger_root <%= rubber_env.passenger_root %>;
+  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;
-	rails_framework_spawner_idle_time 0;
-	rails_app_spawner_idle_time 0;
+  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_friendly_error_pages <%= Rubber.env == 'production' ? 'off' : 'on' %>;
-	
-	passenger_user <%= rubber_env.app_user %>;
-	
+  passenger_friendly_error_pages <%= Rubber.env == 'production' ? 'off' : 'on' %>;
+  
+  passenger_user <%= 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 %>
 }