Core should set hyperkitty url by default to the mailman-web container.

2017-04-21 12:07:22 -07:00
parent cde320477c
commit 2833647e06
2 changed files with 5 additions and 2 deletions
--- 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
--- 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',
 )