From eca79c9858420a39b8c77f987b5f4ead6201e293 Mon Sep 17 00:00:00 2001
From: Abhilash Raj <raj.abhilash1@gmail.com>
Date: Sat, 30 Sep 2017 21:31:59 -0700
Subject: [PATCH] Add allowed hosts using environment vars.

---
 web/README.md               |  4 ++++
 web/mailman-web/settings.py | 17 +++++++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/web/README.md b/web/README.md
index de1ef25..32d1a0f 100644
--- a/web/README.md
+++ b/web/README.md
@@ -54,6 +54,10 @@ change them unless you know what you want.
 - `DJANGO_LOG_URL`: Path to the django's log file. Defaults to
   `/opt/mailman-web-data/logs/mailmanweb.log`.
 
+- `DJANGO_ALLOWED_HOSTS`: Entry to add to ALLOWED_HOSTS in Django
+  configuration. This is a separate configuration from`SERVE_FROM_DOMAIN` as
+  latter is used for other purposes too.
+
 Running
 =======
 
diff --git a/web/mailman-web/settings.py b/web/mailman-web/settings.py
index c017c93..6ee885c 100644
--- a/web/mailman-web/settings.py
+++ b/web/mailman-web/settings.py
@@ -52,6 +52,7 @@ ALLOWED_HOSTS = [
     "mailman-web",
     "172.19.199.3",
     os.environ.get('SERVE_FROM_DOMAIN'),
+    os.environ.get('DJANGO_ALLOWED_HOSTS'),
 ]
 
 # Mailman API credentials
@@ -212,10 +213,11 @@ LOGIN_URL = 'account_login'
 LOGIN_REDIRECT_URL = 'list_index'
 LOGOUT_URL = 'account_logout'
 
-DEFAULT_FROM_EMAIL = 'postorius@localhost.local'
 
-
-SERVER_EMAIL = 'root@localhost.local'
+# Use SERVE_FROM_DOMAIN as the default domain in the email.
+hostname = os.environ.get('SERVE_FROM_DOMAIN', 'localhost.local')
+DEFAULT_FROM_EMAIL = 'postorius@{}'.format(hostname)
+SERVER_EMAIL = 'root@{}'.format(hostname)
 
 # Change this when you have a real email backend
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
@@ -307,6 +309,7 @@ HAYSTACK_CONNECTIONS = {
     },
 }
 
+import sys
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
 # the site admins on every HTTP 500 error when DEBUG=False.
@@ -336,6 +339,8 @@ LOGGING = {
         'console': {
             'class': 'logging.StreamHandler',
             'formatter': 'simple',
+            'level': 'INFO',
+            'stream': sys.stdout,
         },
         # TODO: use an environment variable $DJ_LOG_URL to configure the logging
         # using an environment variable.
@@ -357,8 +362,9 @@ LOGGING = {
             'propagate': True,
         },
         'postorius': {
-            'handlers': ['console', 'file'],
+            'handlers': ['file'],
             'level': 'INFO',
+            'propagate': True
         },
     },
     'formatters': {
@@ -376,6 +382,9 @@ LOGGING = {
 }
 
 
+if os.environ.get('LOG_TO_CONSOLE') == 'yes':
+    LOGGING['loggers']['django']['handlers'].append('console')
+    LOGGING['loggers']['django.request']['handlers'].append('console')
 # HyperKitty-specific
 #
 # Only display mailing-lists from the same virtual host as the webserver