From 34d07b7dfd4283e709a5a742822faecb552139d2 Mon Sep 17 00:00:00 2001
From: Jonathan Dahan <git@jonathan.is>
Date: Thu, 9 Nov 2023 13:44:32 -0500
Subject: [PATCH] fix email for registration

---
 scripts/down       | 2 +-
 scripts/run        | 2 +-
 scripts/up         | 2 +-
 services/auth.yaml | 8 ++++++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/scripts/down b/scripts/down
index 1d27e3a..849bc5c 100755
--- a/scripts/down
+++ b/scripts/down
@@ -1,4 +1,4 @@
-podman compose \
+podman compose --env-file ${ENV_FILE:-.env} \
   --file services/secrets.yaml \
   --file services/backup.yaml  \
   --file services/proxy.yaml \
diff --git a/scripts/run b/scripts/run
index 4df6732..317daff 100755
--- a/scripts/run
+++ b/scripts/run
@@ -1,4 +1,4 @@
-podman compose \
+podman compose --env-file ${ENV_FILE:-.env} \
   --file services/secrets.yaml \
   --file services/backup.yaml  \
   --file services/proxy.yaml \
diff --git a/scripts/up b/scripts/up
index 95fd408..87dee27 100755
--- a/scripts/up
+++ b/scripts/up
@@ -1,4 +1,4 @@
-podman compose \
+podman compose --env-file ${ENV_FILE:-.env} \
   --file services/secrets.yaml \
   --file services/backup.yaml  \
   --file services/proxy.yaml \
diff --git a/services/auth.yaml b/services/auth.yaml
index 494e6ef..bd26706 100644
--- a/services/auth.yaml
+++ b/services/auth.yaml
@@ -25,11 +25,15 @@ services:
       ZITADEL_FIRSTINSTANCE_ORG_NAME: basement
       ZITADEL_FIRSTINSTANCE_ORG_HUMAN_USERNAME: ${ADMIN_USER}
       ZITADEL_FIRSTINSTANCE_ORG_HUMAN_PASSWORD: ${ADMIN_PASS}
-      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_FROM: basement
-      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_FROMNAME: ${DOMAIN}
+
       ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_HOST: "${SMTP_HOST}:${SMTP_PORT}"
       ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_USER: ${SMTP_USER}
       ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_PASSWORD: ${SMTP_PASS}
+      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_SSL: true
+
+      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_FROM: basement@mail.${DOMAIN}
+      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_FROMNAME: basement
+      ZITADEL_DEFAULTINSTANCE_SMTPCONFIGURATION_SMTP_REPLYTOADDRESS: basement@mail.${DOMAIN}
     secrets:
       - MASTER_KEY
     command: "start-from-init --masterkeyFile /run/secrets/MASTER_KEY --tlsMode external"