diff options
| author | Lei Yan | 2013-11-05 17:56:52 +0000 |
|---|---|---|
| committer | Lei Yan | 2013-11-05 17:56:52 +0000 |
| commit | f1e215c78f2d5889cad18d36c1c28623c924b768 (patch) | |
| tree | 06623fe120c2b58570a713f9aac8c8a82504fae6 /wqflask/other_config/nginx_conf/penguin.conf | |
| parent | cced8bc03e6b32f561e554d021710486ac138df0 (diff) | |
| parent | c8d5bd327f0a73d2b7ac1d9935fd2bb6f11cc262 (diff) | |
| download | genenetwork2-f1e215c78f2d5889cad18d36c1c28623c924b768.tar.gz | |
Merge /home/zas1024/gene
Conflicts:
wqflask/wqflask/templates/correlation_page.html
Diffstat (limited to 'wqflask/other_config/nginx_conf/penguin.conf')
| -rw-r--r-- | wqflask/other_config/nginx_conf/penguin.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wqflask/other_config/nginx_conf/penguin.conf b/wqflask/other_config/nginx_conf/penguin.conf index 822556d3..5c380da8 100644 --- a/wqflask/other_config/nginx_conf/penguin.conf +++ b/wqflask/other_config/nginx_conf/penguin.conf @@ -2,7 +2,7 @@ server { # Modeled after http://flask.pocoo.org/docs/deploying/wsgi-standalone/ listen 80; - server_name penguin.uthsc.edu; + server_name gn2python.genenetwork.org; access_log /var/log/nginx/access.log; error_log /var/log/nginx/error.log; |