Merge branch 'release/2.0.0'v2.0.0

1 files changed, 7 insertions, 6 deletions

diff --git a/nginx.conf b/nginx.conf
index ce00e37..d3a8324 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -8,14 +8,14 @@ http {
 
     server_names_hash_bucket_size  256;
 
-    passenger_root /opt/ruby-enterprise-1.8.7-2010.03/lib/ruby/gems/1.8/gems/PASSENGER;
-    passenger_ruby /opt/ruby-enterprise-1.8.7-2010.03/bin/ruby;
+    passenger_root RUBY_DEST/lib/ruby/gems/1.8/gems/PASSENGER;
+    passenger_ruby RUBY_DEST/bin/ruby;
     passenger_default_user opentox;
     passenger_log_level 2;
     passenger_spawn_method conservative;
     #passenger_use_global_queue on;
 
-    include       mime.types;
+    include       NGINX_DEST/conf/mime.types;
     default_type  application/octet-stream;
 
     sendfile        on;
@@ -26,9 +26,10 @@ http {
       listen 80;
       client_max_body_size 5000m;
       server_name SERVERNAME;
-      root /var/www/;
-
-      passenger_enabled on;
+      location / {
+        root WWW_DEST;
+        passenger_enabled on;
+      }
       passenger_base_uri /compound;
       passenger_base_uri /dataset;
       passenger_base_uri /algorithm;