Merge branch 'feature-dev-prod' into 'master'

Make development server work with production settings

Merge branch 'feature-dev-prod' into 'master'
Make development server work with production settings
824c85f5 · Őry Máté · 7e1854d6 · 7e899bbd · 824c85f5
Commit 824c85f5 authored Sep 01, 2014 by Őry Máté
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

circle/circle/settings/production.py
+3 -0

No files found.
--- a/circle/circle/settings/production.py
+++ b/circle/circle/settings/production.py
@@ -20,9 +20,12 @@


 from os import environ
+from sys import argv

 from base import *  # noqa

+if 'runserver' in argv:
+    SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https')

 ########## HOST CONFIGURATION
 # See: https://docs.djangoproject.com/en/1.5/releases/1.5/