aboutsummaryrefslogtreecommitdiff
path: root/wqflask/other_config
diff options
context:
space:
mode:
authorLei Yan2013-05-08 22:16:26 +0000
committerLei Yan2013-05-08 22:16:26 +0000
commitb4371ef0d96605187b7474e7e4844dbebab67d8b (patch)
tree14b68ddaa9916494551c4306c63b1a7719f7d993 /wqflask/other_config
parent34312cfacdcb5af450d33ac3b54d7c01a6a61788 (diff)
downloadgenenetwork2-b4371ef0d96605187b7474e7e4844dbebab67d8b.tar.gz
Worked on correlation page
Wrote function in dataset.py that gets all the traits in a dataset and their sample values
Diffstat (limited to 'wqflask/other_config')
-rw-r--r--wqflask/other_config/wqflask-nginx.conf45
1 files changed, 43 insertions, 2 deletions
diff --git a/wqflask/other_config/wqflask-nginx.conf b/wqflask/other_config/wqflask-nginx.conf
index 50f9d73c..4e6fd0d9 100644
--- a/wqflask/other_config/wqflask-nginx.conf
+++ b/wqflask/other_config/wqflask-nginx.conf
@@ -2,7 +2,7 @@ server {
# Modeled after http://flask.pocoo.org/docs/deploying/wsgi-standalone/
listen 80;
- server_name _;
+ server_name gn2python.genenetwork.org;
access_log /var/log/nginx/access.log;
error_log /var/log/nginx/error.log;
@@ -37,6 +37,47 @@ server {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_read_timeout 40m;
- }
+ }
+}
+
+server {
+ # Modeled after http://flask.pocoo.org/docs/deploying/wsgi-standalone/
+ listen 80;
+
+ server_name gn2python_lei.genenetwork.org;
+
+ access_log /var/log/nginx/lei_access.log;
+ error_log /var/log/nginx/lei_error.log;
+
+ location ^~ /css/ {
+ root /gene/wqflask/wqflask/static/;
+ }
+
+ location ^~ /javascript/ {
+ root /gene/wqflask/wqflask/static/;
+ }
+
+# location ^~ /image/ {
+# root /gene/wqflask/wqflask/static/;
+# }
+
+ location ^~ /images/ {
+ root /gene/wqflask/wqflask/static/;
+ }
+
+ ### New - added by Sam
+ #location ^~ /static/ {
+ # root /gene/wqflask/wqflask/static/;
+ #}
+ location / {
+ proxy_pass http://127.0.0.1:5001/;
+ proxy_redirect off;
+
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+ proxy_read_timeout 40m;
+ }
}