aboutsummaryrefslogtreecommitdiff
path: root/wqflask/other_config/nginx_conf
diff options
context:
space:
mode:
authorZachary Sloan2013-06-20 21:18:09 +0000
committerZachary Sloan2013-06-20 21:18:09 +0000
commit3b2f40f45c1fddf89bba3b53e51771bfc25cd6f2 (patch)
treedf878b990bdf55af9c954c02249ad973f4c0d9c1 /wqflask/other_config/nginx_conf
parent56e91a003a6931de9acaeb8de9410ef91bcc1857 (diff)
parent82bd8b61b4aed0b0ae07477afae37a846fab35c2 (diff)
downloadgenenetwork2-3b2f40f45c1fddf89bba3b53e51771bfc25cd6f2.tar.gz
Merge branch 'flask' of git://github.com/leiyan/GeneNetwork2-Python into flask
Conflicts: wqflask/requirements.txt wqflask/wqflask/correlation/show_corr_results.py
Diffstat (limited to 'wqflask/other_config/nginx_conf')
-rw-r--r--wqflask/other_config/nginx_conf/gn2python.conf41
-rw-r--r--wqflask/other_config/nginx_conf/gn2python_lei.conf41
2 files changed, 82 insertions, 0 deletions
diff --git a/wqflask/other_config/nginx_conf/gn2python.conf b/wqflask/other_config/nginx_conf/gn2python.conf
new file mode 100644
index 00000000..f23e325f
--- /dev/null
+++ b/wqflask/other_config/nginx_conf/gn2python.conf
@@ -0,0 +1,41 @@
+server {
+ # Modeled after http://flask.pocoo.org/docs/deploying/wsgi-standalone/
+ listen 80;
+
+ server_name gn2python.genenetwork.org;
+
+ access_log /var/log/nginx/access.log;
+ error_log /var/log/nginx/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:5000/;
+ 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;
+ }
+}
diff --git a/wqflask/other_config/nginx_conf/gn2python_lei.conf b/wqflask/other_config/nginx_conf/gn2python_lei.conf
new file mode 100644
index 00000000..981bda28
--- /dev/null
+++ b/wqflask/other_config/nginx_conf/gn2python_lei.conf
@@ -0,0 +1,41 @@
+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;
+ }
+} \ No newline at end of file