diff options
-rwxr-xr-x | wqflask/other_config/nginx_conf/gn2.conf (renamed from wqflask/other_config/nginx_conf/gn2python.conf) | 2 | ||||
-rwxr-xr-x | wqflask/other_config/nginx_conf/gn2_lei.conf (renamed from wqflask/other_config/nginx_conf/gn2python_lei.conf) | 4 | ||||
-rwxr-xr-x | wqflask/other_config/nginx_conf/gn2_sam.conf (renamed from wqflask/other_config/nginx_conf/sam.conf) | 4 | ||||
-rwxr-xr-x | wqflask/other_config/nginx_conf/gn2_zach.conf | 42 |
4 files changed, 47 insertions, 5 deletions
diff --git a/wqflask/other_config/nginx_conf/gn2python.conf b/wqflask/other_config/nginx_conf/gn2.conf index f23e325f..a51b4113 100755 --- a/wqflask/other_config/nginx_conf/gn2python.conf +++ b/wqflask/other_config/nginx_conf/gn2.conf @@ -2,7 +2,7 @@ server { # Modeled after http://flask.pocoo.org/docs/deploying/wsgi-standalone/ listen 80; - server_name gn2python.genenetwork.org; + server_name gn2.genenetwork.org; access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log; diff --git a/wqflask/other_config/nginx_conf/gn2python_lei.conf b/wqflask/other_config/nginx_conf/gn2_lei.conf index 981bda28..6589d298 100755 --- a/wqflask/other_config/nginx_conf/gn2python_lei.conf +++ b/wqflask/other_config/nginx_conf/gn2_lei.conf @@ -2,7 +2,7 @@ server { # Modeled after http://flask.pocoo.org/docs/deploying/wsgi-standalone/ listen 80; - server_name gn2python_lei.genenetwork.org; + server_name gn2_lei.genenetwork.org; access_log /var/log/nginx/lei_access.log; error_log /var/log/nginx/lei_error.log; @@ -38,4 +38,4 @@ server { proxy_read_timeout 40m; } -}
\ No newline at end of file +} diff --git a/wqflask/other_config/nginx_conf/sam.conf b/wqflask/other_config/nginx_conf/gn2_sam.conf index 3cc443a8..f9abbbd2 100755 --- a/wqflask/other_config/nginx_conf/sam.conf +++ b/wqflask/other_config/nginx_conf/gn2_sam.conf @@ -2,7 +2,7 @@ server { # Modeled after http://flask.pocoo.org/docs/deploying/wsgi-standalone/ listen 80; - server_name sam.genenetwork.org; + server_name gn2_sam.genenetwork.org; access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log; @@ -29,7 +29,7 @@ server { #} location / { - proxy_pass http://127.0.0.1:5555/; + proxy_pass http://127.0.0.1:5005/; proxy_redirect off; proxy_set_header Host $host; diff --git a/wqflask/other_config/nginx_conf/gn2_zach.conf b/wqflask/other_config/nginx_conf/gn2_zach.conf new file mode 100755 index 00000000..e7284e8c --- /dev/null +++ b/wqflask/other_config/nginx_conf/gn2_zach.conf @@ -0,0 +1,42 @@ +server { + # Modeled after http://flask.pocoo.org/docs/deploying/wsgi-standalone/ + listen 80; + + server_name gn2_zach.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:5002/; + 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; + } +} + |