diff options
| author | Pjotr Prins | 2016-10-17 09:56:28 +0000 |
|---|---|---|
| committer | Pjotr Prins | 2016-10-17 09:56:28 +0000 |
| commit | 4ce94838a8e90636910456415b0a30bb77c88aaf (patch) | |
| tree | 08b2a273c1fa88b3f42683828d3358ee820ceaaf /etc | |
| parent | 141b7336f947bb617802eda785afa5872d82d411 (diff) | |
| parent | d79f4ebc6176185660e8e69218a0e2583b8e960f (diff) | |
| download | genenetwork2-4ce94838a8e90636910456415b0a30bb77c88aaf.tar.gz | |
Merge branch 'pjotr-gn2' into chfi
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/default_settings.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/default_settings.py b/etc/default_settings.py index ac5dc266..08eae024 100644 --- a/etc/default_settings.py +++ b/etc/default_settings.py @@ -26,7 +26,7 @@ GN_VERSION = open("../VERSION","r").read() SQL_URI = "mysql://gn2:mysql_password@localhost/db_webqtl_s" SQLALCHEMY_DATABASE_URI = 'mysql://gn2:mysql_password@localhost/db_webqtl_s' SQLALCHEMY_POOL_RECYCLE = 3600 -GN_SERVER_URL = "http://localhost:8880/" +GN_SERVER_URL = "http://test-gn2.genenetwork.org/" # ---- Flask configuration (see website) TRAP_BAD_REQUEST_ERRORS = True @@ -37,7 +37,7 @@ SECURITY_RECOVERABLE = True SECURITY_EMAIL_SENDER = "no-reply@genenetwork.org" SECURITY_POST_LOGIN_VIEW = "/thank_you" -SERVER_PORT = 5003 +SERVER_PORT = 5003 # running on localhost SECRET_HMAC_CODE = '\x08\xdf\xfa\x93N\x80\xd9\\H@\\\x9f`\x98d^\xb4a;\xc6OM\x946a\xbc\xfc\x80:*\xebc' # ---- Behavioural settings (defaults) note that logger and log levels can @@ -45,6 +45,7 @@ SECRET_HMAC_CODE = '\x08\xdf\xfa\x93N\x80\xd9\\H@\\\x9f`\x98d^\xb4a;\xc6OM\x946a WEBSERVER_MODE = 'DEV' # Python webserver mode (DEBUG|DEV|PROD) WEBSERVER_BRANDING = None # Set the branding (nyi) WEBSERVER_DEPLOY = None # Deployment specifics (nyi) +WEBSERVER_URL = "http://localhost:"+str(SERVER_PORT)+"/" # external URL LOG_LEVEL = 'WARNING' # Logger mode (DEBUG|INFO|WARNING|ERROR|CRITICAL) LOG_LEVEL_DEBUG = '0' # logger.debugf log level (0-5, 5 = show all) @@ -72,4 +73,3 @@ LOCAL_PRIVATE_FILES = HOME+"/gn2_private_data" # private static data files PYLMM_COMMAND = str.strip(os.popen("which pylmm_redis").read()) PLINK_COMMAND = str.strip(os.popen("which plink2").read()) GEMMA_COMMAND = str.strip(os.popen("which gemma").read()) - |