Merge branch 'dev' into pb-mock-documents
This commit is contained in:
commit
652c9b908f
|
@ -9,11 +9,12 @@ FLASK_PORT = environ.get('PORT0') or environ.get('FLASK_PORT', default="5001")
|
|||
CORS_ALLOW_ORIGINS = re.split(r',\s*', environ.get('CORS_ALLOW_ORIGINS', default="localhost:5000"))
|
||||
DEVELOPMENT = environ.get('DEVELOPMENT', default="true") == "true"
|
||||
TESTING = environ.get('TESTING', default="false") == "true"
|
||||
PRODUCTION = (environ.get('PRODUCTION', default="false") == "true")
|
||||
PRODUCTION = environ.get('PRODUCTION', default="false") == "true"
|
||||
|
||||
# Add trailing slash to base path
|
||||
APPLICATION_ROOT = re.sub(r'//', '/', '/%s/' % environ.get('APPLICATION_ROOT', default="/").strip('/'))
|
||||
|
||||
|
||||
DB_HOST = environ.get('DB_HOST', default="localhost")
|
||||
DB_PORT = environ.get('DB_PORT', default="5432")
|
||||
DB_NAME = environ.get('DB_NAME', default="pb")
|
||||
|
|
Loading…
Reference in New Issue