From 485a2cf5fd9465c47852ac679bfd9f7e8a20e711 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Fri, 8 Nov 2024 20:12:44 +0000
Subject: [PATCH] make SMTP server configurable

---
 .env-sample                           | 2 ++
 data-template/mas/config.yaml         | 4 ++--
 data-template/synapse/homeserver.yaml | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.env-sample b/.env-sample
index 325ee06..ec05862 100644
--- a/.env-sample
+++ b/.env-sample
@@ -22,6 +22,8 @@ REPORT_STATS=yes
 
 IDENTITY_SERVER_URL=https://vector.im
 
+SMTP_HOST=mailhog
+SMTP_PORT=1025
 MAIL_NOTIF_FROM_ADDRESS=noreply@$DOMAIN
 ABUSE_SUPPORT_EMAIL=abuse@$DOMAIN
 SECURITY_SUPPORT_EMAIL=security@$DOMAIN
diff --git a/data-template/mas/config.yaml b/data-template/mas/config.yaml
index a4862e3..9f782f8 100644
--- a/data-template/mas/config.yaml
+++ b/data-template/mas/config.yaml
@@ -44,8 +44,8 @@ email:
   reply_to: '${MAS_EMAIL_REPLY_TO}'
   transport: smtp
   mode: plain
-  hostname: mailhog
-  port: 1025
+  hostname: ${SMTP_HOST}
+  port: ${SMTP_PORT}
 ${SECRETS_MAS_SECRETS}
 passwords:
   enabled: true
diff --git a/data-template/synapse/homeserver.yaml b/data-template/synapse/homeserver.yaml
index e3bf564..c16b5fa 100644
--- a/data-template/synapse/homeserver.yaml
+++ b/data-template/synapse/homeserver.yaml
@@ -70,8 +70,8 @@ background_updates:
     sleep_enabled: false
 
 email:
-  smtp_host: mailhog
-  smtp_port: 1025
+  smtp_host: ${SMTP_HOST}
+  smtp_port: ${SMTP_PORT}
   enable_tls: false
   notif_from: "Your %(app)s homeserver <${MAIL_NOTIF_FROM_ADDRESS}>"
   app_name: Matrix