From 49a98aa4283d4ed37d28bc11517b18e512cf2a78 Mon Sep 17 00:00:00 2001 From: unkin-agent Date: Tue, 13 Oct 2026 21:43:43 +1100 Subject: [PATCH] Add main.unkin.net as a second mail domain (#550) main.unkin.net is the test mail domain: it receives into the existing unkin.net mailboxes, and its outbound mail is DKIM-signed as d=unkin.net, which aligns under relaxed DMARC. - relay main.unkin.net on the smarthost and route it to Stalwart over LMTP - add main.unkin.net as a domain alias of unkin.net in Stalwart Reviewed-on: https://git.unkin.net/unkin/argocd-apps/pulls/550 Co-authored-by: unkin-agent Co-committed-by: unkin-agent --- apps/base/mail/smarthost/relay_domains | 1 + apps/base/mail/smarthost/transport | 1 + apps/base/mail/stalwart-configmap.yaml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/base/mail/smarthost/relay_domains b/apps/base/mail/smarthost/relay_domains index 59818b2..856ab55 100644 --- a/apps/base/mail/smarthost/relay_domains +++ b/apps/base/mail/smarthost/relay_domains @@ -1 +1,2 @@ unkin.net OK +main.unkin.net OK diff --git a/apps/base/mail/smarthost/transport b/apps/base/mail/smarthost/transport index 828306f..73a02db 100644 --- a/apps/base/mail/smarthost/transport +++ b/apps/base/mail/smarthost/transport @@ -1 +1,2 @@ unkin.net lmtp:[stalwart.mail.svc.cluster.local]:24 +main.unkin.net lmtp:[stalwart.mail.svc.cluster.local]:24 diff --git a/apps/base/mail/stalwart-configmap.yaml b/apps/base/mail/stalwart-configmap.yaml index 437f83a..b8da9c9 100644 --- a/apps/base/mail/stalwart-configmap.yaml +++ b/apps/base/mail/stalwart-configmap.yaml @@ -13,7 +13,7 @@ data: config.json: | {"@type":"PostgreSql","host":"stalwart-db-rw.mail.svc","port":5432,"database":"stalwart","authUsername":"stalwart","authSecret":{"@type":"EnvironmentVariable","variableName":"DB_PASSWORD"},"useTls":true} plan.ndjson: | - {"@type":"upsert","object":"Domain","matchOn":["name"],"value":{"unkin":{"name":"unkin.net","certificateManagement":{"@type":"Manual"},"dkimManagement":{"@type":"Manual"},"dnsManagement":{"@type":"Manual"},"subAddressing":{"@type":"Enabled"}}}} + {"@type":"upsert","object":"Domain","matchOn":["name"],"value":{"unkin":{"name":"unkin.net","aliases":{"main.unkin.net":true},"certificateManagement":{"@type":"Manual"},"dkimManagement":{"@type":"Manual"},"dnsManagement":{"@type":"Manual"},"subAddressing":{"@type":"Enabled"}}}} {"@type":"upsert","object":"Certificate","matchOn":["certificate"],"value":{"cert":{"certificate":{"@type":"File","filePath":"/etc/stalwart/tls/tls.crt"},"privateKey":{"@type":"File","filePath":"/etc/stalwart/tls/tls.key"}}}} {"@type":"upsert","object":"Directory","matchOn":["description"],"value":{"authentik":{"@type":"Oidc","description":"Authentik","issuerUrl":"https://identity.unkin.net/application/o/stalwart/","requireAudience":"stalwart","requireScopes":{},"claimUsername":"preferred_username","usernameDomain":"unkin.net","claimName":"name"}}} {"@type":"upsert","object":"Application","matchOn":["description"],"value":{"webui":{"description":"Stalwart Web Interface","resourceUrl":"https://github.com/stalwartlabs/webui/releases/download/v1.0.11/webui.zip","urlPrefix":{"/admin":true,"/account":true},"unpackDirectory":"/var/lib/stalwart/webui","oauthClientId":"stalwart"}}}