Dockerfile

@@ -68,7 +68,9 @@ RUN postconf -e non_smtpd_milters=inet:opendkim:8891
 RUN postconf -e milter_default_action=accept
 RUN postconf -e milter_protocol=6
 RUN postconf -e virtual_alias_maps=lmdb:/etc/postfix/maps/virtual
+RUN postconf -e sender_canonical_maps=tcp:postsrsd:10001
 RUN postconf -e sender_canonical_classes=envelope_sender
+RUN postconf -e recipient_canonical_maps=tcp:postsrsd:10002
 RUN postconf -e recipient_canonical_classes=envelope_recipient,header_recipient
 RUN postconf -e smtpd_client_connection_rate_limit=10
 

postfixd.sh

@@ -2,22 +2,17 @@
 
 case $1 in
   start)
+    if test -z "${RSPAMD}" ; then
+      echo "Missing rspamd hostname" >&2
+      exit 1
+    fi
+
     # Reconfigure postfix according to environment
     postconf -e myhostname="${DOMAIN}"
     postconf -e mydomain="${SUTTY}"
     postconf -e smtpd_tls_key_file="/etc/letsencrypt/live/${DOMAIN}/privkey.pem"
     postconf -e smtpd_tls_cert_file="/etc/letsencrypt/live/${DOMAIN}/fullchain.pem"
-
-    if test -n "${MILTERS}"; then
-      postconf -e smtpd_milters="${MILTERS}"
-      postconf -e non_smtpd_milters="${MILTERS}"
-    fi
-
-    if test -n "${SRS}"; then
-      postconf -e sender_canonical_maps=tcp:${SRS}:10001
-      postconf -e recipient_canonical_maps=tcp:${SRS}:10002
-    fi
-
+    postconf -e smtpd_milters="inet:${RSPAMD}:11332,inet:opendkim:8891"
     test -n "${NETWORKS}" && postconf -e mynetworks="${NETWORKS}"
 
     ;;