diff options
| -rw-r--r-- | etc/default_settings.py | 10 | ||||
| -rwxr-xr-x | scripts/run_debug.sh | 20 |
2 files changed, 28 insertions, 2 deletions
diff --git a/etc/default_settings.py b/etc/default_settings.py index 64a78686..f368237b 100644 --- a/etc/default_settings.py +++ b/etc/default_settings.py @@ -32,7 +32,7 @@ GN_SERVER_URL = "http://localhost:8880/" # REST API server SQL_URI = "mysql://gn2:mysql_password@localhost/db_webqtl_s" SQL_ALCHEMY_POOL_RECYCLE = 3600 GN_SERVER_URL = "http://localhost:8880/" # REST API server -GN2_BASE_URL = "http://genenetwork.org/" +GN2_BASE_URL = "http://genenetwork.org/" # to pick up REST API GN2_BRANCH_URL = GN2_BASE_URL # ---- Flask configuration (see website) @@ -44,7 +44,13 @@ SECURITY_RECOVERABLE = True SECURITY_EMAIL_SENDER = "no-reply@genenetwork.org" SECURITY_POST_LOGIN_VIEW = "/thank_you" -SERVER_PORT = 5003 # running on localhost +# ---- SERVER_PORT needs an override before firing up the server +SERVER_PORT = os.environ['SERVER_PORT'] +if isinstance(SERVER_PORT, str): + SERVER_PORT = int(SERVER_PORT) # don't do this for other settings! +else: + SERVER_PORT = 5003 + SECRET_HMAC_CODE = '\x08\xdf\xfa\x93N\x80\xd9\\H@\\\x9f`\x98d^\xb4a;\xc6OM\x946a\xbc\xfc\x80:*\xebc' GITHUB_CLIENT_ID = "UNKNOWN" diff --git a/scripts/run_debug.sh b/scripts/run_debug.sh new file mode 100755 index 00000000..be7ecdb8 --- /dev/null +++ b/scripts/run_debug.sh @@ -0,0 +1,20 @@ +#! /bin/bash +# +# PLEASE DO NOT CHANGE THIS FILE - copy it elsewhere to run +# +# Run with GN2_PROFILE and SERVER_PORT overrides, e.g. +# +# env GN2_PROFILE=/usr/local/guix-profiles/gn-latest SERVER_PORT=5010 scripts/run_debug.sh + +[ -z $GN2_PROFILE ] && export GN2_PROFILE=/usr/local/guix-profiles/gn-latest +[ -z $SERVER_PORT ] && export SERVER_PORT=5010 + +echo Running on port $SERVER_PORT from $GN2_PROFILE + +cwd=`pwd` +echo Running source from $cwd + +mkdir -p ~/tmp + +env TMPDIR=~/tmp WEBSERVER_MODE=DEBUG LOG_LEVEL=DEBUG GENENETWORK_FILES=/export/data/genenetwork/genotype_files/ SQL_URI=mysql://webqtlout:webqtlout@localhost/db_webqtl ./bin/genenetwork2 etc/default_settings.py -gunicorn-dev + |