diff options
| author | Zachary Sloan | 2013-06-20 22:20:23 +0000 |
|---|---|---|
| committer | Zachary Sloan | 2013-06-20 22:20:23 +0000 |
| commit | 4ffee373494170e708678039dca132f1bd729ab1 (patch) | |
| tree | a9d6054380f5a9d612a4d1d88889f68ea4923a75 /wqflask/cfg | |
| parent | 939058c4a3b668037974f2876b072c4be008da26 (diff) | |
| parent | 52ac4b6e1c014801080cbbcad53df868058d2657 (diff) | |
| download | genenetwork2-4ffee373494170e708678039dca132f1bd729ab1.tar.gz | |
Merge branch 'flask'
Diffstat (limited to 'wqflask/cfg')
| -rw-r--r-- | wqflask/cfg/default_settings.py | 12 | ||||
| -rw-r--r-- | wqflask/cfg/zach_settings.py | 5 |
2 files changed, 11 insertions, 6 deletions
diff --git a/wqflask/cfg/default_settings.py b/wqflask/cfg/default_settings.py index 1811ccfd..96f7f1a5 100644 --- a/wqflask/cfg/default_settings.py +++ b/wqflask/cfg/default_settings.py @@ -1,5 +1,15 @@ LOGFILE = """/tmp/flask_gn_log""" +SERVER_PORT = 5000 + #This is needed because Flask turns key errors into a -#400 bad request response with no exception/log +#400 bad request response with no exception/log TRAP_BAD_REQUEST_ERRORS = True + +# http://pythonhosted.org/Flask-Security/configuration.html +SECURITY_CONFIRMABLE = True +SECURITY_TRACKABLE = True +SECURITY_REGISTERABLE = True +SECURITY_RECOVERABLE = True + +SECURITY_EMAIL_SENDER = "no-reply@genenetwork.org" diff --git a/wqflask/cfg/zach_settings.py b/wqflask/cfg/zach_settings.py deleted file mode 100644 index 8d3bf4ab..00000000 --- a/wqflask/cfg/zach_settings.py +++ /dev/null @@ -1,5 +0,0 @@ -LOGFILE = """/tmp/flask_gn_log""" - -TRAP_BAD_REQUEST_ERRORS = True - -DB_URI = """mysql://webqtl:webqtl@localhost/db_webqtl_zas1024"""
\ No newline at end of file |