From d6abdeb1acf12b8dd95d01ede76bbf86a5205366 Mon Sep 17 00:00:00 2001
From: decentral1se <hi@decentral1.se>
Date: Sat, 8 May 2021 22:59:16 +0200
Subject: [PATCH] Disambig the SMTP env vars

---
 .env.sample | 2 ++
 compose.yml | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.env.sample b/.env.sample
index 9e38eee..e5a8300 100644
--- a/.env.sample
+++ b/.env.sample
@@ -4,6 +4,8 @@ DOMAIN=lists.example.com
 LETS_ENCRYPT_ENV=production
 
 MTA=postfix
+CORE_SMTP_HOST=mail.example.com
+CORE_SMTP_PORT=25
 
 SERVE_FROM_DOMAIN=${DOMAIN}
 
diff --git a/compose.yml b/compose.yml
index 24baf72..e75c156 100644
--- a/compose.yml
+++ b/compose.yml
@@ -14,8 +14,9 @@ services:
       - hyperkitty_api_key
       - mailman_rest_password
     environment:
+      - CORE_SMTP_HOST
+      - CORE_SMTP_PORT
       - DATABASE_CLASS=mailman.database.postgresql.PostgreSQLDatabase
-      - DATABASE_D
       - DATABASE_DB=mailman
       - DATABASE_HOST=db
       - DATABASE_NAME=mailman
@@ -23,11 +24,10 @@ services:
       - DATABASE_TYPE=postgres
       - DATABASE_USER=mailman
       - HYPERKITTY_API_KEY_FILE=/run/secrets/hyperkitty_api_key
+      - MAILMAN_HOSTNAME=mailman-core
       - MAILMAN_REST_PASSWORD_FILE=/run/secrets/mailman_rest_password
       - MAILMAN_REST_USER=restadmin
       - MTA
-      - SMTP_HOST
-      - SMTP_PORT
     configs:
       - source: core_entrypoint_sh
         target: /usr/local/bin/docker-entrypoint-custom.sh