github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

Postfix: rename "smtps" to "submissions" (#3235)

Browse source
This commit is contained in:
Georg Lauterbach 2023-05-10 11:29:51 +02:00 committed by GitHub
parent c461dabe9e
commit 595ff03804
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/content/config/advanced/kubernetes.md
View file

@ -460,7 +460,7 @@ Then, configure both [Postfix][docs-postfix] and [Dovecot][docs-dovecot] to expe
postfix-master.cf: | postfix-master.cf: |
smtp/inet/postscreen_upstream_proxy_protocol=haproxy smtp/inet/postscreen_upstream_proxy_protocol=haproxy
submission/inet/smtpd_upstream_proxy_protocol=haproxy submission/inet/smtpd_upstream_proxy_protocol=haproxy
smtps/inet/smtpd_upstream_proxy_protocol=haproxy submissions/inet/smtpd_upstream_proxy_protocol=haproxy
dovecot.cf: | dovecot.cf: |
# Assuming your ingress controller is bound to 10.0.0.0/8 # Assuming your ingress controller is bound to 10.0.0.0/8
haproxy_trusted_networks = 10.0.0.0/8, 127.0.0.0/8 haproxy_trusted_networks = 10.0.0.0/8, 127.0.0.0/8

2
docs/content/examples/tutorials/mailserver-behind-proxy.md
View file

@ -105,7 +105,7 @@ and to `docker-data/dms/config/postfix-master.cf`:
```cf ```cf
submission/inet/smtpd_upstream_proxy_protocol=haproxy submission/inet/smtpd_upstream_proxy_protocol=haproxy
smtps/inet/smtpd_upstream_proxy_protocol=haproxy submissions/inet/smtpd_upstream_proxy_protocol=haproxy
``` ```
Changes for `dovecot` can be applied by adding the following content to `docker-data/dms/config/dovecot.cf`: Changes for `dovecot` can be applied by adding the following content to `docker-data/dms/config/dovecot.cf`:

4
target/postfix/master.cf
View file

@ -27,8 +27,8 @@ submission inet n - n - - smtpd
-o milter_macro_daemon_name=ORIGINATING -o milter_macro_daemon_name=ORIGINATING
-o cleanup_service_name=sender-cleanup -o cleanup_service_name=sender-cleanup
smtps inet n - n - - smtpd submissions inet n - n - - smtpd
-o syslog_name=postfix/smtps -o syslog_name=postfix/submissions
-o smtpd_tls_wrappermode=yes -o smtpd_tls_wrappermode=yes
-o smtpd_sasl_auth_enable=yes -o smtpd_sasl_auth_enable=yes
-o smtpd_sasl_type=dovecot -o smtpd_sasl_type=dovecot

4
target/scripts/helpers/ssl.sh
View file

@ -342,7 +342,7 @@ function _setup_ssl
# | http://www.postfix.org/postconf.5.html#smtpd_tls_auth_only | http://www.postfix.org/TLS_README.html#server_tls_auth # | http://www.postfix.org/postconf.5.html#smtpd_tls_auth_only | http://www.postfix.org/TLS_README.html#server_tls_auth
# #
# smtp_tls_wrappermode (default: not applied, 'no') | http://www.postfix.org/postconf.5.html#smtp_tls_wrappermode # smtp_tls_wrappermode (default: not applied, 'no') | http://www.postfix.org/postconf.5.html#smtp_tls_wrappermode
# smtpd_tls_wrappermode (default: 'yes' for service port 'smtps') | http://www.postfix.org/postconf.5.html#smtpd_tls_wrappermode # smtpd_tls_wrappermode (default: 'yes' for service port 'submissions') | http://www.postfix.org/postconf.5.html#smtpd_tls_wrappermode
# NOTE: Enabling wrappermode requires a security_level of 'encrypt' or stronger. Port 465 presently does not meet this condition. # NOTE: Enabling wrappermode requires a security_level of 'encrypt' or stronger. Port 465 presently does not meet this condition.
# #
# Postfix main.cf (base config): # Postfix main.cf (base config):
@ -353,7 +353,7 @@ function _setup_ssl
# #
# Postfix master.cf (per connection overrides): # Postfix master.cf (per connection overrides):
# Disables implicit TLS on port 465 for inbound (smtpd) and outbound (smtp) traffic. Treats it as equivalent to port 25 SMTP with explicit STARTTLS. # Disables implicit TLS on port 465 for inbound (smtpd) and outbound (smtp) traffic. Treats it as equivalent to port 25 SMTP with explicit STARTTLS.
# Inbound 465 (aka service port aliases: submissions / smtps) for Postfix to receive over implicit TLS (eg from MUA or functioning as a relay host). # Inbound 465 (aka service port aliases: submissions) for Postfix to receive over implicit TLS (eg from MUA or functioning as a relay host).
# Outbound 465 as alternative to port 587 when sending to another MTA (with authentication), such as a relay service (eg SendGrid). # Outbound 465 as alternative to port 587 when sending to another MTA (with authentication), such as a relay service (eg SendGrid).
sedfile -i -r \ sedfile -i -r \
-e "/smtpd?_tls_security_level/s|=.*|=none|" \ -e "/smtpd?_tls_security_level/s|=.*|=none|" \