Skip to content

pub / flynn-django-template

Go to a project
Commit f69efdf1 by Kenneth Reitz Committed by GitHub
Options

Merge pull request #72 from akshaybabloo/master 

Add to 'database' instead of updating it
parents 4cd10bc3 edb2d81a
Showing with 2 additions and 3 deletions
project_name/settings.py
...@@ -108,9 +108,8 @@ USE_I18N = True ...@@ -108,9 +108,8 @@ USE_I18N = True
USE_L10N = True USE_L10N = True
USE_TZ = True USE_TZ = True
# Update database configuration with $DATABASE_URL. # Change 'default' database configuration with $DATABASE_URL.
db_from_env = dj_database_url.config(conn_max_age=500) DATABASES['default'] = dj_database_url.config(conn_max_age=500)
DATABASES['default'].update(db_from_env)
# Honor the 'X-Forwarded-Proto' header for request.is_secure() # Honor the 'X-Forwarded-Proto' header for request.is_secure()
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment