summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--roles/mailman/files/urls.py2
-rw-r--r--roles/mailman/templates/settings.py.j26
2 files changed, 5 insertions, 3 deletions
diff --git a/roles/mailman/files/urls.py b/roles/mailman/files/urls.py
index 9cdf11b21..53a9a794b 100644
--- a/roles/mailman/files/urls.py
+++ b/roles/mailman/files/urls.py
@@ -18,6 +18,8 @@ urlpatterns = patterns('',
#url(r'^$', 'postorius.views.list_index'),
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}),
+ # BrowserID
url(r'', include('django_browserid.urls'), {"SSL": True}),
)
diff --git a/roles/mailman/templates/settings.py.j2 b/roles/mailman/templates/settings.py.j2
index b010fba3c..e074059a9 100644
--- a/roles/mailman/templates/settings.py.j2
+++ b/roles/mailman/templates/settings.py.j2
@@ -193,9 +193,9 @@ TEMPLATE_DIRS = (
SESSION_SERIALIZER = 'django.contrib.sessions.serializers.PickleSerializer'
-LOGIN_URL = '/archives/accounts/login/'
-LOGIN_REDIRECT_URL = '/archives/'
-LOGIN_ERROR_URL = '/archives/accounts/login/'
+LOGIN_URL = 'hk_user_login'
+LOGOUT_URL = 'hk_user_logout'
+LOGIN_REDIRECT_URL = 'hk_root'
BROWSERID_USERNAME_ALGO = lambda email: email # Use the email as identifier
BROWSERID_VERIFY_CLASS = "django_browserid.views.Verify"