diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py index 93e0f9b2126a9abcd952660d118cc4a5f36238ae..67541dd77d30fc70d221758e475a018444022da3 100644 --- a/pinaxcon/settings.py +++ b/pinaxcon/settings.py @@ -31,6 +31,11 @@ ALLOWED_HOSTS = ["localhost", ".herokuapp.com", ".northbaypython.org"] # system time zone. TIME_ZONE = os.environ.get("TZ", "America/Los_Angeles") + +# Use SSLRedirectMiddleware +SSL_ON = os.environ.get("DJANGO_SSL_ON", True) +SSL_ALWAYS = os.environ.get("DJANGO_SSL_ALWAYS", False) + # Language code for this installation. All choices can be found here: # http://www.i18nguy.com/unicode/language-identifiers.html LANGUAGE_CODE = "en-us" @@ -118,6 +123,8 @@ MIDDLEWARE_CLASSES = [ "django.contrib.messages.middleware.MessageMiddleware", "reversion.middleware.RevisionMiddleware", "django.middleware.clickjacking.XFrameOptionsMiddleware", + "ssl_redirect.middleware.SSLRedirectMiddleware", + ] ROOT_URLCONF = "pinaxcon.urls" diff --git a/requirements/base.txt b/requirements/base.txt index 36a1dc51d405ce37e77239ee5559c7e271f5c787..d68731417e0a35a97d06f8cf47efc21ea6232c64 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -7,6 +7,7 @@ dj-static==0.0.6 dj-database-url==0.4.0 pinax-pages==0.4.2 pinax-boxes==2.1.2 +django-ssl-redirect==2.0 django-libsass==0.7 django-markdown-deux==1.0.5 django-sitetree==1.8.0