Merge branch 'master' into patch-2

This commit is contained in:
Stefan de Kooter 2019-12-09 22:54:30 +01:00 committed by GitHub
commit 135199e597
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 206 additions and 53 deletions

View file

@ -39,6 +39,8 @@ DATABASE = {
'PORT': os.environ.get('DB_PORT', ''), # Database port (leave blank for default)
'OPTIONS': {'sslmode': os.environ.get('DB_SSLMODE', 'prefer')},
# Database connection SSLMODE
'CONN_MAX_AGE': int(os.environ.get('DB_CONN_MAX_AGE', '300')),
# Database connection persistence
}
# This key is used for secure generation of random numbers and strings. It must never be exposed outside of this file.