diff options
| author | zsloan | 2018-01-24 20:14:06 +0000 |
|---|---|---|
| committer | zsloan | 2018-01-24 20:14:06 +0000 |
| commit | 4634cf87761980a1682473211259698b7be720e4 (patch) | |
| tree | 7168293e7cf674a4250ea84080bd83112552ae93 /etc | |
| parent | 623cdd2cfafc3d2dd45bc1adf460c9f3c5120e7a (diff) | |
| parent | 56065c9f994c9247eaa17e5216d44d0e5e733aa2 (diff) | |
| download | genenetwork2-4634cf87761980a1682473211259698b7be720e4.tar.gz | |
Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testing
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/VERSION | 2 | ||||
| -rw-r--r-- | etc/default_settings.py | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/etc/VERSION b/etc/VERSION index 1785aa28..b624c74a 100644 --- a/etc/VERSION +++ b/etc/VERSION @@ -1 +1 @@ -2.10rc3 +2.10rc5 diff --git a/etc/default_settings.py b/etc/default_settings.py index c00f6c8f..59e22f1a 100644 --- a/etc/default_settings.py +++ b/etc/default_settings.py @@ -2,7 +2,7 @@ # webserver running in developer mode with limited console # output. Copy this file and run it from ./bin/genenetwork2 configfile # -# Note that these settings are fetched in ./wqflask/utilities/tools.py +# Note: these settings are fetched in ./wqflask/utilities/tools.py # which has support for overriding them through environment variables, # e.g. # @@ -14,8 +14,12 @@ # Note also that in the near future we will additionally fetch # settings from a JSON file # -# Note that values for False and 0 have to be strings here - otherwise +# Note: values for False and 0 have to be strings here - otherwise # Flask won't pick them up +# +# For GNU Guix deployment also check the paths in +# +# ~/.guix-profile/lib/python2.7/site-packages/genenetwork2-2.0-py2.7.egg/etc/default_settings.py import os import sys @@ -34,7 +38,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 @@ -42,6 +46,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) |