From c34f0e3040fae767e20043079b1d8fc89e6f5932 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Thu, 26 May 2022 00:41:54 +0200
Subject: [PATCH] feat(postfix): Allow relay setup

This patch updates the container image to allow relayhosts with TLS
enabled.
---
 images/postfix/Containerfile  |  2 +-
 images/postfix/config/main.cf | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/images/postfix/Containerfile b/images/postfix/Containerfile
index d77d4b43c..9f7b2db3c 100644
--- a/images/postfix/Containerfile
+++ b/images/postfix/Containerfile
@@ -6,7 +6,7 @@ RUN apk add --no-cache ca-certificates rsyslog supervisor
 RUN update-ca-certificates
 
 
-RUN apk add --no-cache postfix
+RUN apk add --no-cache postfix cyrus-sasl cyrus-sasl-login
 
 RUN mkdir /var/spool/postfix/etc && echo "smtp		25/tcp		mail		# Simple Mail Transfer" > /var/spool/postfix/etc/services
 
diff --git a/images/postfix/config/main.cf b/images/postfix/config/main.cf
index d827423b3..ecfb7b7ac 100644
--- a/images/postfix/config/main.cf
+++ b/images/postfix/config/main.cf
@@ -64,7 +64,7 @@ smtp_tls_CAfile = /etc/ssl/certs/ca-certificates.crt
 #smtpd_tls_session_cache_database = btree:${data_directory}/smtpd_scache
 #smtp_tls_session_cache_database = btree:${data_directory}/smtp_scache
 
-#smtp_tls_policy_maps = lmdb:/srv/tmp/tls-policies
+smtp_tls_policy_maps = lmdb:/srv/tmp/tls-policies
 
 ########
 ##
@@ -156,6 +156,18 @@ virtual_mailbox_maps = lmdb:/srv/tmp/mailboxes
 virtual_mailbox_domains = lmdb:/srv/tmp/domains
 local_recipient_maps = $virtual_mailbox_maps
 
+## Relay config
+
+sender_dependent_relayhost_maps = lmdb:/srv/tmp/relayhosts
+
+## SMTP sasl
+
+smtp_sasl_auth_enable = yes
+smtp_sasl_security_options = noanonymous
+smtp_sasl_tls_security_options = noanonymous
+smtp_sasl_password_maps = lmdb:/srv/tmp/sasl_passwd
+smtp_tls_note_starttls_offer = yes
+
 ########
 ##
 ## Miscellaneous
-- 
GitLab