From 2833647e063440a2b197649a1b5ac7d4c93c437e Mon Sep 17 00:00:00 2001 From: Abhilash Raj Date: Fri, 21 Apr 2017 12:07:22 -0700 Subject: [PATCH] Core should set hyperkitty url by default to the mailman-web container. --- core/assets/run.sh | 4 ++++ web/mailman-web/settings.py | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/core/assets/run.sh b/core/assets/run.sh index 1dabcb7..1d610f9 100755 --- a/core/assets/run.sh +++ b/core/assets/run.sh @@ -60,6 +60,10 @@ if [[ ! -v SMTP_PORT ]]; then export SMTP_PORT=25 fi +if [[ ! -v HYPERKITTY_URL ]]; then + export HYPERKITTY_URL=http://mailman-web:8000/ +fi + if [[ ! -d /config/ ]]; then mkdir /config/ fi diff --git a/web/mailman-web/settings.py b/web/mailman-web/settings.py index cf67613..173ed20 100644 --- a/web/mailman-web/settings.py +++ b/web/mailman-web/settings.py @@ -91,8 +91,7 @@ INSTALLED_APPS = ( 'allauth.socialaccount.providers.github', 'allauth.socialaccount.providers.gitlab', 'allauth.socialaccount.providers.google', - #'allauth.socialaccount.providers.facebook', - #'allauth.socialaccount.providers.twitter', + 'allauth.socialaccount.providers.facebook', #'allauth.socialaccount.providers.stackexchange', )