From 3837c6cb556d9e167a43faad8beb8ddab04405e8 Mon Sep 17 00:00:00 2001
From: decentral1se <hi@decentral1.se>
Date: Fri, 14 May 2021 15:46:35 +0200
Subject: [PATCH] Shuffle env vars for simplicity

---
 .env.sample | 14 +++++---------
 README.md   |  2 +-
 compose.yml |  6 +++---
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.env.sample b/.env.sample
index ef277ac..2f8093a 100644
--- a/.env.sample
+++ b/.env.sample
@@ -5,21 +5,17 @@ LETS_ENCRYPT_ENV=production
 
 SERVE_FROM_DOMAIN=${DOMAIN}
 
-MTA=postfix
-CORE_SMTP_HOST=mail_example_com_smtp # mailu smtp
-CORE_SMTP_PORT=25
-
 MAILMAN_ADMIN_EMAIL=admin@example.com
 
 SMTP_HOST=mail_example_com_smtp # mailu smtp
 SMTP_PORT=25
 
-# Keycloak SSO
-# KEYCLOAK_SSO_ENABLED=1
-# KEYCLOAK_DOMAIN=login.example.com
-# KEYCLOAK_REALM=sso-queens-united
-
 SECRET_DB_PASSWORD_VERSION=v1
 SECRET_DJANGO_SECRET_KEY_VERSION=v1
 SECRET_HYPERKITTY_API_KEY_VERSION=v1
 SECRET_MAILMAN_REST_PASSWORD_VERSION=v1
+
+# Keycloak SSO
+# KEYCLOAK_SSO_ENABLED=1
+# KEYCLOAK_DOMAIN=login.example.com
+# KEYCLOAK_REALM=sso-queens-united
diff --git a/README.md b/README.md
index b668217..f6e8273 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ A mailing list management system.
 
 > https://docs.mailman3.org
 
-This configuration is intended to be used with [mailu](https://git.autonomic.zone/coop-cloud/mailu).
+This configuration is intended to be used with [mailu](https://git.autonomic.zone/coop-cloud/mailu), assumes the use of a postfix MTA and requires that you share networks and volumes between your Mailu stack and your Mailman3 stack. After installation, you need to run `manage.py createsuperuser` against your `mailman-web` container to create an admin account.
 
 <!-- metadata -->
 
diff --git a/compose.yml b/compose.yml
index f150ec8..04c0733 100644
--- a/compose.yml
+++ b/compose.yml
@@ -14,8 +14,6 @@ services:
       - hyperkitty_api_key
       - mailman_rest_password
     environment:
-      - CORE_SMTP_HOST
-      - CORE_SMTP_PORT
       - DATABASE_CLASS=mailman.database.postgresql.PostgreSQLDatabase
       - DATABASE_DB=mailman
       - DATABASE_HOST=db
@@ -27,7 +25,9 @@ services:
       - MAILMAN_HOSTNAME=mailman-core
       - MAILMAN_REST_PASSWORD_FILE=/run/secrets/mailman_rest_password
       - MAILMAN_REST_USER=restadmin
-      - MTA
+      - MTA=postfix
+      - SMTP_HOST
+      - SMTP_PORT
     configs:
       - source: core_entrypoint_sh
         target: /usr/local/bin/docker-entrypoint-custom.sh