diff options
author | zsloan | 2018-04-02 10:55:03 -0500 |
---|---|---|
committer | GitHub | 2018-04-02 10:55:03 -0500 |
commit | 92e89794fa57ef1570631403a8ceebf52a2cbc08 (patch) | |
tree | 6a67253cbcda1e258f6cd18cd5d80001e01d01a1 /wqflask/other_config/nginx_conf/gn2_sam.conf | |
parent | 5424741a4a126bfd5f04df7cbcdc30b4e1376b86 (diff) | |
parent | 9544ca2e6461b267c28d9a4c7fe976bc34f10be3 (diff) | |
download | genenetwork2-92e89794fa57ef1570631403a8ceebf52a2cbc08.tar.gz |
Merge pull request #300 from pjotrp/testing
Testing
Diffstat (limited to 'wqflask/other_config/nginx_conf/gn2_sam.conf')
-rw-r--r-- | wqflask/other_config/nginx_conf/gn2_sam.conf | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/wqflask/other_config/nginx_conf/gn2_sam.conf b/wqflask/other_config/nginx_conf/gn2_sam.conf deleted file mode 100644 index f9abbbd2..00000000 --- a/wqflask/other_config/nginx_conf/gn2_sam.conf +++ /dev/null @@ -1,42 +0,0 @@ -server { - # Modeled after http://flask.pocoo.org/docs/deploying/wsgi-standalone/ - listen 80; - - server_name gn2_sam.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:5005/; - 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; - } -} - |