From 4e648709083b826a841de2db8396571c880c44e2 Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Wed, 27 Oct 2021 18:24:09 +0200
Subject: [PATCH] [Mail] Update Postfix changelog

---
 pica-mail/pica-mail-mta/CHANGELOG.md | 9 +++++++++
 pica-mail/pica-mail-mta/config.sh    | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/pica-mail/pica-mail-mta/CHANGELOG.md b/pica-mail/pica-mail-mta/CHANGELOG.md
index e8524c98..99c57f6f 100644
--- a/pica-mail/pica-mail-mta/CHANGELOG.md
+++ b/pica-mail/pica-mail-mta/CHANGELOG.md
@@ -1,3 +1,12 @@
+# v1.0.3
+
+- Re-open port 25 for incoming mails
+- Move away ENV from Dockerfile (better to have only one self-documented place, ie Compose)
+- Remove `smtps` service from `master.cf` as it is obsolete and not mapped to any host port
+- Remove `virtual_minimum_uid` already set to the default and does not seem useful without `virtual_uid_maps`
+- Remove unused files (old private key, old rsyslog config)
+- Try to clarify some comments (not sure they are tho)
+- Fix syntax for milter filters (from Romain's hotfix on monitoring)
 # v1.0.2
 
 Support for LDAPS
diff --git a/pica-mail/pica-mail-mta/config.sh b/pica-mail/pica-mail-mta/config.sh
index d3b19dae..363eea18 100755
--- a/pica-mail/pica-mail-mta/config.sh
+++ b/pica-mail/pica-mail-mta/config.sh
@@ -140,15 +140,15 @@ adduser opendmarc postdrop
 # SSL : récupération des certificats (qui seront utilisés pour la connexion SMTP)
 postconf -e "smtpd_tls_cert_file = ${SSL_CERT}"
 postconf -e "smtpd_tls_key_file = ${SSL_KEY}"
-postconf -e "smtpd_tls_security_level = may"
 
 # Activation du port 587 (port "submission")
 cat <<EOF >> /etc/postfix/master.cf
 submission inet n       -       y       -       -       smtpd
 EOF
 
-# Autorise le SSL pour des mails sortants mais n'interdit pas le clair lorsque ce n'est pas disponible
+# Autorise TLS pour des mails entrants et sortants mais n'interdit pas le clair lorsque ce n'est pas disponible
 postconf -e "smtp_tls_security_level=may"
+postconf -e "smtpd_tls_security_level=may"
 
 # 9. Logs
 # On garde les fichiers de logs pour les monter dans l'exporter
-- 
GitLab