Merge branch 'staging' of github.com:pjotrp/genenetwork2 into staging

2 files changed, 19 insertions, 16 deletions

diff --git a/etc/nginx-genenetwork.conf b/etc/nginx-genenetwork.conf
index b966fe6d..06fd3c57 100644
--- a/etc/nginx-genenetwork.conf
+++ b/etc/nginx-genenetwork.conf
@@ -1,9 +1,3 @@
-# nginx configuration example for GeneNetwork
-#
-# Simple port reverse proxy from port 80 to 5003 for domain
-#
-# See also the information in ./doc/README.org
-
 user  nobody;
 worker_processes  4;
 pid /var/run/nginx.pid;
@@ -11,15 +5,15 @@ pid /var/run/nginx.pid;
 error_log  /var/log/nginx/error.log;
 
 events {
-    worker_connections  4;
+    worker_connections  16;
 }
 
 http {
-    # include       mime.types;
-    default_type  application/octet-stream;
+    include       mime.types;
+    # default_type  application/octet-stream;
 
-    sendfile        on;
-    keepalive_timeout  65;
+    # sendfile        on;
+    keepalive_timeout  480;
 
     server {
         listen       80;
@@ -34,18 +28,27 @@ http {
         location = /50x.html {
             root   html;
         }
-
     }
 
     server {
         listen 80;
         server_name test-gn2.genenetwork.org;
         access_log  logs/test-gn2.access.log;
+
+        proxy_connect_timeout       3000;
+        proxy_send_timeout          3000;
+        proxy_read_timeout          3000;
+        send_timeout                3000;
+
         location / {
-            proxy_set_header   X-Real-IP $remote_addr;
+            # proxy_set_header   Host $host;
             proxy_set_header   Host      $http_host;
+            # proxy_redirect     off;
+            proxy_set_header   Connection keep-alive;
+            proxy_set_header   X-Real-IP $remote_addr;
+            proxy_set_header   X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header   X-Forwarded-Host $server_name;
             proxy_pass         http://127.0.0.1:5003;
         }
     }
-
 }
diff --git a/wqflask/base/webqtlConfig.py b/wqflask/base/webqtlConfig.py
index cdce119a..f62207e0 100755
--- a/wqflask/base/webqtlConfig.py
+++ b/wqflask/base/webqtlConfig.py
@@ -64,8 +64,8 @@ ENSEMBLETRANSCRIPT_URL="http://useast.ensembl.org/Mus_musculus/Lucene/Details?sp
 TMPDIR               = mk_dir(TEMPDIR+'/gn2/')
 CACHEDIR             = mk_dir(TEMPDIR+'/cache/')
 # We can no longer write into the git tree:
-GENERATED_IMAGE_DIR  = mk_dir(TMPDIR+'/generate/')
-GENERATED_TEXT_DIR   = mk_dir(TMPDIR+'/generate_text/')
+GENERATED_IMAGE_DIR  = mk_dir(TMPDIR+'/generated/')
+GENERATED_TEXT_DIR   = mk_dir(TMPDIR+'/generated_text/')
 
 # Flat file directories
 GENODIR              = flat_files('genotype')+'/'