Compare commits

..

No commits in common. "7e51f789f4bad8b16e5c10e8efdc31c38513fca2" and "85ff03055651b1dd61ad4b501f16118ba1d39cff" have entirely different histories.

2 changed files with 8 additions and 11 deletions

View file

@ -68,7 +68,9 @@ RUN postconf -e non_smtpd_milters=inet:opendkim:8891
RUN postconf -e milter_default_action=accept RUN postconf -e milter_default_action=accept
RUN postconf -e milter_protocol=6 RUN postconf -e milter_protocol=6
RUN postconf -e virtual_alias_maps=lmdb:/etc/postfix/maps/virtual 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 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 recipient_canonical_classes=envelope_recipient,header_recipient
RUN postconf -e smtpd_client_connection_rate_limit=10 RUN postconf -e smtpd_client_connection_rate_limit=10

View file

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