Change all the configuration variables to ENVIRONMENT VARS.

Following 12factor principle for app development, all the configuration
variables for the docker images can now be setup using environment vars.

The default values are set using the run.sh script in both mailman-web
and mailman-core containers.

Mailman-core is now run by "run.sh" which traps SIGTERM and performs
mailman stop for graceful exit of mailman core.

web/assets/run.sh

@@ -1,29 +1,8 @@
 #! /bin/bash
 set -e
 
-# Check if $DATABASE_URL is defined, if not, use a standard sqlite database.
-#
-# If the $DATABASE_URL is defined and is postgres, check if it is available
-# yet. Do not start the container before the postgresql boots up.
-#
-# If the $DATABASE_URL is defined and is mysql, check if the database is
-# available before the container boots up.
-#
-# TODO: Check the database type and detect if it is up based on that. For now,
-# assume that postgres is being used if DATABASE_URL is defined.
-if [[ -z "$DATABASES_URL" ]]; then
-	echo "$DATABASE_URL is not defined. Using sqlite database..."
-	DATABASE_URL="sqlite:///opt/mailman-web-data/database/mailmanweb.db"
-	DATABASE_TYPE='sqlite'
-	if [[ ! -e "/opt/mailman-web-data/database" ]]; then
-		mkdir -p /opt/mailman-web-data/database/
-	fi
-else
-	DATABASE_TYPE='postgres'
-	wait_for_postgres()
-fi
 
-function wait_for_postgres {
+function wait_for_postgres () {
 	# Check if the postgres database is up and accepting connections before
 	# moving forward.
 	# TODO: Use python's psycopg2 module to do this in python instead of
@@ -35,7 +14,7 @@ function wait_for_postgres {
 	>&2 echo "Postgres is up - continuing"
 }
 
-function check_or_create {
+function check_or_create () {
 	# Check if the path exists, if not, create the directory.
 	if [[ ! -e dir ]]; then
 		echo "$1 does not exist, creating ..."
@@ -43,6 +22,38 @@ function check_or_create {
 	fi
 }
 
+# function postgres_ready(){
+# python << END
+# import sys
+# import psycopg2
+# try:
+#     conn = psycopg2.connect(dbname="$POSTGRES_DB", user="$POSTGRES_USER", password="$POSTGRES_PASSWORD", host="postgres")
+# except psycopg2.OperationalError:
+#     sys.exit(-1)
+# sys.exit(0)
+# END
+# }
+
+# Check if $DATABASE_URL is defined, if not, use a standard sqlite database.
+#
+# If the $DATABASE_URL is defined and is postgres, check if it is available
+# yet. Do not start the container before the postgresql boots up.
+#
+# If the $DATABASE_URL is defined and is mysql, check if the database is
+# available before the container boots up.
+#
+# TODO: Check the database type and detect if it is up based on that. For now,
+# assume that postgres is being used if DATABASE_URL is defined.
+
+if [[ ! -v DATABASE_URL ]]; then
+	echo "DATABASE_URL is not defined. Using sqlite database..."
+	export DATABASE_URL=sqlite://mailmanweb.db
+	export DATABASE_TYPE='sqlite'
+else
+	export DATABASE_TYPE='postgres'
+	wait_for_postgres
+fi
+
 # Check if we are in the correct directory before running commands.
 if [[ ! $(pwd) == '/opt/mailman-web' ]]; then
 	echo "Running in the wrong directory...switching to /opt/mailman-web"
@@ -57,7 +68,7 @@ if [[ ! -e /opt/mailman-web-data/logs/mailmanweb.log ]]; then
 	touch /opt/mailman-web-data/logs/mailmanweb.log
 fi
 
-if [[ ! -e /opt/mailman-web-data/logs/mailmanweb.log ]]; then
+if [[ ! -e /opt/mailman-web-data/logs/uwsgi.log ]]; then
 	echo "Creating log file for uwsgi.."
 	touch /opt/mailman-web-data/logs/uwsgi.log
 fi
@@ -84,11 +95,18 @@ python manage.py migrate
 # It can also point to a logging daemon accessible at a URL.
 if [[ -z "$UWSGI_LOG_URL" ]]; then
 	echo "No $UWSGI_LOG_URL defined, logging uwsgi to /opt/mailman-web-data/logs/uwsgi.log ..."
-	UWSGI_LOG_URL='/opt/mailman-web-data/logs/uwsgi.log'
+	export UWSGI_LOG_URL='/opt/mailman-web-data/logs/uwsgi.log'
 	if [[ ! -e "$UWSGI_LOG_URL" ]]; then
 		touch "$UWSGI_LOG_URL"
 	fi
 fi
 
+if [[ -z "$UWSGI_WSGI_FILE" ]]; then
+	export UWSGI_WSGI_FILE="wsgi.py"
+	export UWSGI_HTTP=":8000"
+	export UWSGI_WORKERS=2
+	export UWSGI_THREADS=4
+fi
+
 # Run the web server.
 uwsgi --http-auto-chunked --http-keepalive --logto "$UWSGI_LOG_URL"

web/mailman-web/settings.py

@@ -27,6 +27,7 @@ https://docs.djangoproject.com/en/1.8/ref/settings/
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
+import dj_database_url
 
 BASE_DIR = os.path.dirname(os.path.abspath(__file__))
 
@@ -47,16 +48,17 @@ SITE_ID = 1
 ALLOWED_HOSTS = [
     "localhost",  # Archiving API from Mailman, keep it.
     # "lists.your-domain.org",
+    os.environ.get('SERVE_FROM_DOMAIN'),
     # Add here all production URLs you may have.
     "mailman-web",
 ]
 
 # Mailman API credentials
-MAILMAN_REST_API_URL = 'http://mailman-core:8001'
-MAILMAN_REST_API_USER = 'restadmin'
-MAILMAN_REST_API_PASS = 'restpass'
-MAILMAN_ARCHIVER_KEY = 'ASmallAPIKey'
-MAILMAN_ARCHIVER_FROM = ('mailman-web', '172.19.199.3')
+MAILMAN_REST_API_URL = os.environ.get('MAILMAN_REST_URL', 'http://mailman-core:8001')
+MAILMAN_REST_API_USER = os.environ.get('MAILMAN_REST_USER', 'restadmin')
+MAILMAN_REST_API_PASS = os.environ.get('MAILMAN_REST_PASSWORD', 'restpass')
+MAILMAN_ARCHIVER_KEY = os.environ.get('HYPERKITTY_API_KEY')
+MAILMAN_ARCHIVER_FROM = ('mailman-web', os.environ.get('DJANGO_HOST_IP', '172.19.199.3'))
 
 # Application definition
 
@@ -142,8 +144,12 @@ WSGI_APPLICATION = 'wsgi.application'
 # https://docs.djangoproject.com/en/1.8/ref/settings/#databases
 
 
-DATABASES['default'] = dj-database-url.config(conn_max_age=600)
-
+# This uses $DATABASE_URL from the environment variable to create a
+# django-style-config-dict.
+# https://github.com/kennethreitz/dj-database-url
+DATABASES = {
+    'default': dj_database_url.config(conn_max_age=600)
+}
 
 # If you're behind a proxy, use the X-Forwarded-Host header
 # See https://docs.djangoproject.com/en/1.8/ref/settings/#use-x-forwarded-host
@@ -262,13 +268,11 @@ SERVER_EMAIL = 'root@localhost.local'
 
 # Change this when you have a real email backend
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
-EMAIL_HOST = '172.19.199.1'
-EMAIL_PORT = 25
+EMAIL_HOST = os.environ.get('SMTP_HOST', '172.19.199.1')
+EMAIL_PORT = os.environ.get('SMTP_PORT', 25)
 EMAIL_HOST_USER = ''
 EMAIL_HOST_PASSWORD = ''
 EMAIL_USE_TLS = False
-DEFAULT_FROM_EMAIL = 'Admin <admin@localhost.local>'
-
 
 # Compatibility with Bootstrap 3
 from django.contrib.messages import constants as messages  # flake8: noqa
@@ -404,6 +408,8 @@ LOGGING = {
             'class': 'logging.StreamHandler',
             'formatter': 'simple',
         },
+        # TODO: use an environment variable $DJ_LOG_URL to configure the logging
+        # using an environment variable.
     },
     'loggers': {
         'django.request': {