aboutsummaryrefslogtreecommitdiff
path: root/wqflask/other_config
diff options
context:
space:
mode:
authorpjotrp2015-11-18 11:19:01 +0100
committerpjotrp2015-11-18 11:19:01 +0100
commitcb0f10fc4850b6b06f2237b532317a5c6668584a (patch)
treed143662ecceac5e05bd06afee4c87b2beb88859b /wqflask/other_config
parent28ec342362ba068b3d0b5b9a302bc279d251f160 (diff)
parent0310301b30c59eca45235cd1bd1ff8e15923950a (diff)
downloadgenenetwork2-cb0f10fc4850b6b06f2237b532317a5c6668584a.tar.gz
Merge branch 'master' of https://github.com/zsloan/genenetwork2 into zsloan
Diffstat (limited to 'wqflask/other_config')
-rwxr-xr-xwqflask/other_config/nginx_conf/gn2_zach.conf5
1 files changed, 5 insertions, 0 deletions
diff --git a/wqflask/other_config/nginx_conf/gn2_zach.conf b/wqflask/other_config/nginx_conf/gn2_zach.conf
index e7284e8c..23f3995f 100755
--- a/wqflask/other_config/nginx_conf/gn2_zach.conf
+++ b/wqflask/other_config/nginx_conf/gn2_zach.conf
@@ -28,6 +28,11 @@ server {
# root /gene/wqflask/wqflask/static/;
#}
+ location /plink_gemma/ {
+ root /home/zas1024/gene/wqflask/wqflask/;
+ autoindex on;
+ }
+
location / {
proxy_pass http://127.0.0.1:5002/;
proxy_redirect off;