This commit is contained in:
github-actions[bot] 2025-06-20 04:42:31 +00:00
parent c19e29b381
commit 3d7373798f
3 changed files with 58 additions and 58 deletions

View file

@ -2923,7 +2923,7 @@ postconf<span class="w"> </span>-P<span class="w"> </span><span class="m">10465<
<span class="c1"># Create a variant for port 25 too (NOTE: Port 10025 is already assigned in DMS to Amavis):</span>
postconf<span class="w"> </span>-Mf<span class="w"> </span>smtp/inet<span class="w"> </span><span class="p">|</span><span class="w"> </span>sed<span class="w"> </span>-e<span class="w"> </span>s/^smtp/12525/<span class="w"> </span>&gt;&gt;<span class="w"> </span>/etc/postfix/master.cf
<span class="c1"># Enable PROXY Protocol support (different setting as port 25 is handled via postscreen), optionally configure a `syslog_name` to distinguish in logs:</span>
postconf<span class="w"> </span>-P<span class="w"> </span><span class="m">12525</span>/inet/postscreen_upstream_proxy_protocol<span class="o">=</span>haproxy<span class="w"> </span><span class="m">12525</span>/inet/syslog_name<span class="o">=</span>smtp-proxyprotocol
postconf<span class="w"> </span>-P<span class="w"> </span><span class="m">12525</span>/inet/postscreen_upstream_proxy_protocol<span class="o">=</span>haproxy<span class="w"> </span><span class="m">12525</span>/inet/syslog_name<span class="o">=</span>postfix/smtpd-proxyprotocol
</code></pre></div>
<p>Supporting port 25 with an additional PROXY protocol port will also require a <code>postfix-main.cf</code> override line for <code>postscreen</code> to work correctly:</p>
<div class="highlight"><span class="filename">docker-data/dms/config/postfix-main.cf</span><pre><span></span><code><span class="na">postscreen_cache_map</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">proxy:btree:$data_directory/postscreen_cache</span>
@ -2938,12 +2938,12 @@ postconf<span class="w"> </span>-P<span class="w"> </span><span class="m">12525<
<div class="highlight"><span class="filename">docker-data/dms/config/dovecot.cf</span><pre><span></span><code><span class="na">haproxy_trusted_networks</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">172.16.42.2</span>
<span class="na">service imap-login {</span>
<span class="w"> </span><span class="na">inet_listener imap-proxied {</span>
<span class="w"> </span><span class="na">inet_listener imap-proxyprotocol {</span>
<span class="w"> </span><span class="na">haproxy</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">yes</span>
<span class="w"> </span><span class="na">port</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">10143</span>
<span class="w"> </span><span class="na">}</span>
<span class="w"> </span><span class="na">inet_listener imaps-proxied {</span>
<span class="w"> </span><span class="na">inet_listener imaps-proxyprotocol {</span>
<span class="w"> </span><span class="na">haproxy</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">yes</span>
<span class="w"> </span><span class="na">port</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">10993</span>
<span class="w"> </span><span class="na">ssl</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">yes</span>
@ -2951,12 +2951,12 @@ postconf<span class="w"> </span>-P<span class="w"> </span><span class="m">12525<
<span class="na">}</span>
<span class="na">service pop3-login {</span>
<span class="w"> </span><span class="na">inet_listener pop3-proxied {</span>
<span class="w"> </span><span class="na">inet_listener pop3-proxyprotocol {</span>
<span class="w"> </span><span class="na">haproxy</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">yes</span>
<span class="w"> </span><span class="na">port</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">10110</span>
<span class="w"> </span><span class="na">}</span>
<span class="w"> </span><span class="na">inet_listener pop3s-proxied {</span>
<span class="w"> </span><span class="na">inet_listener pop3s-proxyprotocol {</span>
<span class="w"> </span><span class="na">haproxy</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">yes</span>
<span class="w"> </span><span class="na">port</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">10995</span>
<span class="w"> </span><span class="na">ssl</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">yes</span>
@ -2964,7 +2964,7 @@ postconf<span class="w"> </span>-P<span class="w"> </span><span class="m">12525<
<span class="na">}</span>
<span class="na">service managesieve-login {</span>
<span class="w"> </span><span class="na">inet_listener sieve-proxied {</span>
<span class="w"> </span><span class="na">inet_listener sieve-proxyprotocol {</span>
<span class="w"> </span><span class="na">haproxy</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">yes</span>
<span class="w"> </span><span class="na">port</span><span class="w"> </span><span class="o">=</span><span class="w"> </span><span class="s">14190</span>
<span class="w"> </span><span class="na">}</span>

File diff suppressed because one or more lines are too long

View file

@ -2,206 +2,206 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/faq/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/introduction/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/usage/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/debugging/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/environment/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/pop3/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/setup.sh/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/account-management/overview/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/account-management/provisioner/file/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/account-management/provisioner/ldap/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/account-management/supplementary/master-accounts/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/account-management/supplementary/oauth2/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/full-text-search/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/ipv6/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/kubernetes/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/mail-fetchmail/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/mail-getmail/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/mail-sieve/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/optional-config/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/podman/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/mail-forwarding/aws-ses/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/mail-forwarding/gmail-smtp/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/mail-forwarding/relay-hosts/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/maintenance/update-and-cleanup/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/override-defaults/dovecot/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/override-defaults/postfix/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/advanced/override-defaults/user-patches/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/best-practices/autodiscover/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/best-practices/dkim_dmarc_spf/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/best-practices/mta-sts/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/security/fail2ban/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/security/mail_crypt/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/security/rspamd/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/security/ssl/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/config/security/understanding-the-ports/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/contributing/general/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/contributing/issues-and-pull-requests/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/contributing/tests/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/tutorials/basic-installation/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/tutorials/blog-posts/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/tutorials/crowdsec/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/tutorials/docker-build/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/tutorials/dovecot-solr/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/tutorials/mailserver-behind-proxy/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/use-cases/auth-lua/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/use-cases/bind-smtp-network-interface/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/use-cases/external-relay-only-mailserver/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/use-cases/forward-only-mailserver-with-ldap-authentication/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/use-cases/imap-folders/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
<url>
<loc>https://docker-mailserver.github.io/docker-mailserver/edge/examples/use-cases/ios-mail-push-support/</loc>
<lastmod>2025-06-02</lastmod>
<lastmod>2025-06-20</lastmod>
</url>
</urlset>