diff options
| author | Pjotr Prins | 2020-04-28 11:14:36 -0500 |
|---|---|---|
| committer | Pjotr Prins | 2020-04-28 11:14:36 -0500 |
| commit | c675d97beab2b41bd6a1581f13bed59406d038f1 (patch) | |
| tree | f3c17c8e521300413acf9e7a81a00e1bad18ab9b /etc | |
| parent | caa9966df61a9e4290d36af557adc3ede1a3674b (diff) | |
| parent | 9ec149a6a7498fc812ed4a44fa85bb746475a253 (diff) | |
| download | genenetwork2-c675d97beab2b41bd6a1581f13bed59406d038f1.tar.gz | |
Merge with conflicts
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/default_settings.py | 10 |
1 files changed, 8 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" |