diff options
| -rw-r--r-- | roles/mailman/files/urls.py | 4 | ||||
| -rw-r--r-- | roles/mailman/templates/settings.py.j2 | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/roles/mailman/files/urls.py b/roles/mailman/files/urls.py index 53a9a794b..26e6a76b8 100644 --- a/roles/mailman/files/urls.py +++ b/roles/mailman/files/urls.py @@ -19,7 +19,7 @@ urlpatterns = patterns('', url(r'^admin/', include('postorius.urls')), url(r'^archives/', include('hyperkitty.urls')), # Social Auth - url(r'', include('social.apps.django_app.urls', namespace='social'), {"SSL": True}), + url(r'', include('social.apps.django_app.urls', namespace='social')), # BrowserID - url(r'', include('django_browserid.urls'), {"SSL": True}), + url(r'', include('django_browserid.urls')), ) diff --git a/roles/mailman/templates/settings.py.j2 b/roles/mailman/templates/settings.py.j2 index c94011b41..24bb94a43 100644 --- a/roles/mailman/templates/settings.py.j2 +++ b/roles/mailman/templates/settings.py.j2 @@ -82,7 +82,7 @@ MIDDLEWARE_CLASSES = ( 'django.contrib.messages.middleware.MessageMiddleware', # Uncomment the next line for simple clickjacking protection: # 'django.middleware.clickjacking.XFrameOptionsMiddleware', - 'hyperkitty.middleware.SSLRedirect', + #'hyperkitty.middleware.SSLRedirect', 'hyperkitty.middleware.TimezoneMiddleware', ) @@ -382,8 +382,9 @@ APP_NAME = 'Fedora list archives' # By default, only a login through Persona or your email provider is allowed. USE_INTERNAL_AUTH = False -# Use SSL when logged in -USE_SSL = True +# Use SSL when logged in. You need to enable the SSLRedirect middleware for +# this feature to work. +#USE_SSL = True # Only display mailing-lists from the same virtual host as the webserver FILTER_VHOST = False |