From d61141dda48f32a0b6443b264d8fd7506ceee2b8 Mon Sep 17 00:00:00 2001 From: Tom Date: Thu, 19 Nov 2026 02:03:53 +0000 Subject: [PATCH] mailserver: persist the mail-ingest login password generate_secrets only fills an in-memory map; mailserver's secrets.sh never wrote it back, so MAIL_INGEST_SMTP_PASSWORD would be regenerated and lost on every run and mail-ingest's compose would refuse to start. The existing mail passwords live in .env.global, which only `corekit init` writes. Write the key to the service .env when it is missing, and list it in .env.example. --- services/mail-system/mailserver/.env.example | 2 ++ services/mail-system/mailserver/secrets.sh | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/services/mail-system/mailserver/.env.example b/services/mail-system/mailserver/.env.example index 27ddc906..5a00d0cb 100644 --- a/services/mail-system/mailserver/.env.example +++ b/services/mail-system/mailserver/.env.example @@ -16,3 +16,5 @@ MAIL_INFO_PASSWORD='' # BASE_DOMAIN='' # Set in .env.global # MAILSERVER_WEBMAIL_HOSTNAME='' # Set in .env.global # PROJECT_ROOT='' # Set in .env.global +# Login mail-ingest uses to relay inbound mail (auto-generated) +MAIL_INGEST_SMTP_PASSWORD='' diff --git a/services/mail-system/mailserver/secrets.sh b/services/mail-system/mailserver/secrets.sh index 00d4c267..9b182759 100644 --- a/services/mail-system/mailserver/secrets.sh +++ b/services/mail-system/mailserver/secrets.sh @@ -22,3 +22,10 @@ declare -A SECRETS=( # Generate secrets generate_secrets SECRETS + +# generate_secrets only fills the in-memory map; nothing writes it back to .env. +# The mail-ingest login must persist (mail-ingest's compose reads it), so write +# it here if .env does not have it yet. +if ! grep -q "^MAIL_INGEST_SMTP_PASSWORD=." "$SCRIPT_DIR/.env" 2>/dev/null; then + update_env_var "$SCRIPT_DIR/.env" "MAIL_INGEST_SMTP_PASSWORD" "${SERVICE_ENV_VARS[MAIL_INGEST_SMTP_PASSWORD]}" +fi