Configurable recipient delimiter (jeboehm#122)

TopTuK · Apr 1, 2021 · 6d79b19 · 6d79b19
1 parent d676239
commit 6d79b19
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 4 deletions.
diff --git a/.env.dist b/.env.dist
@@ -11,3 +11,4 @@ ENABLE_IMAP=true
 ENABLE_POP3=true
 CONTROLLER_PASSWORD=changeme
 WAITSTART_TIMEOUT=2m
+RECIPIENT_DELIMITER=-
diff --git a/mda/Dockerfile b/mda/Dockerfile
@@ -19,7 +19,8 @@ ENV MYSQL_HOST=db \
     ENABLE_IMAP=true \
     SSL_CERT=/media/tls/mailserver.crt \
     SSL_KEY=/media/tls/mailserver.key \
-    WAITSTART_TIMEOUT=1m
+    WAITSTART_TIMEOUT=1m \
+    RECIPIENT_DELIMITER=-
 
 RUN apk --no-cache add \
          curl \

diff --git a/mda/rootfs/etc/dovecot/conf.d/15-lda.conf.templ b/mda/rootfs/etc/dovecot/conf.d/15-lda.conf.templ
@@ -2,4 +2,4 @@ postmaster_address = {{ .Env.POSTMASTER }}
 hostname = {{ .Env.MAILNAME }}
 submission_host = {{ .Env.SUBMISSION_HOST }}
 lda_mailbox_autosubscribe = yes
-recipient_delimiter = -
+recipient_delimiter = {{ .Env.RECIPIENT_DELIMITER }}
diff --git a/mta/Dockerfile b/mta/Dockerfile
@@ -21,7 +21,8 @@ ENV MAILNAME=mail.example.com \
     RELAYHOST=false \
     SSL_CERT=/media/tls/mailserver.crt \
     SSL_KEY=/media/tls/mailserver.key \
-    WAITSTART_TIMEOUT=1m
+    WAITSTART_TIMEOUT=1m \
+    RECIPIENT_DELIMITER=-
 
 RUN apk --no-cache add \
       postfix-mysql \
@@ -47,7 +48,7 @@ RUN apk --no-cache add \
     postconf soft_bounce=no && \
     postconf message_size_limit=52428800 && \
     postconf mailbox_size_limit=0 && \
-    postconf recipient_delimiter=- && \
+    postconf recipient_delimiter="$RECIPIENT_DELIMITER" && \
     postconf mynetworks="$MYNETWORKS" && \
     postconf maximal_queue_lifetime=1h && \
     postconf bounce_queue_lifetime=1h && \

diff --git a/mta/rootfs/usr/local/bin/entrypoint.sh b/mta/rootfs/usr/local/bin/entrypoint.sh
@@ -3,6 +3,7 @@ set -e
 
 postconf myhostname="${MAILNAME}"
 postconf mynetworks="${MYNETWORKS}"
+postconf recipient_delimiter="${RECIPIENT_DELIMITER}"
 
 if [ "${FILTER_MIME}" == "true" ]
 then