Skip to content

[pull] master from docker-mailserver:master #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 4 commits into from
Sep 22, 2025
Merged

[pull] master from docker-mailserver:master #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c4a2dd1
fix: PROXY protocol share postscreen cache
polarathene Sep 20, 2025
2229467
Merge pull request #187 from docker-mailserver/fix/proxy-protocol-pos…
cfis Sep 22, 2025
2147183
Fix #181 - update to char version 5.0.0 to match readme
cfis Sep 22, 2025
a4f6647
Merge pull request #188 from cfis/master
cfis Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/docker-mailserver/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
appVersion: "15.0.2"
description: A fullstack but simple mailserver (smtp, imap, antispam, antivirus, ssl...) using Docker.
name: docker-mailserver
version: 4.2.4
version: 5.0.0
sources:
- https://github.com/docker-mailserver/docker-mailserver-helm
maintainers:
Expand Down
11 changes: 9 additions & 2 deletions charts/docker-mailserver/tests/__snapshot__/configmap_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,15 @@ manifest should match snapshot:

# Create a variant for port 25 too (NOTE: Port 10025 is already assigned in DMS to Amavis):
postconf -Mf smtp/inet | sed -e s/^smtp/12525/ >> /etc/postfix/master.cf
# Enable PROXY Protocol support (different setting as port 25 is handled via postscreen), optionally configure a `syslog_name` to distinguish in logs:
postconf -P 12525/inet/postscreen_upstream_proxy_protocol=haproxy 12525/inet/postscreen_cache_map=proxy:btree:\$data_directory/postscreen_12525_cache 12525/inet/syslog_name=postfix/smtpd-proxyprotocol
# Enable PROXY Protocol support:
# - Uses a different setting as port 25 is handled via the postscreen service
# - Optionally configure a `syslog_name` to distinguish in logs:
postconf -P \
12525/inet/postscreen_upstream_proxy_protocol=haproxy \
12525/inet/syslog_name=postfix/smtpd-proxyprotocol

# Add the `proxy:` prefix to share this cache between each running postscreen service via `proxymap`:
postconf 'postscreen_cache_map = proxy:btree:$data_directory/postscreen_cache'
kind: ConfigMap
metadata:
labels:
Expand Down
11 changes: 9 additions & 2 deletions charts/docker-mailserver/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,8 +614,15 @@ configMaps:

# Create a variant for port 25 too (NOTE: Port 10025 is already assigned in DMS to Amavis):
postconf -Mf smtp/inet | sed -e s/^smtp/12525/ >> /etc/postfix/master.cf
# Enable PROXY Protocol support (different setting as port 25 is handled via postscreen), optionally configure a `syslog_name` to distinguish in logs:
postconf -P 12525/inet/postscreen_upstream_proxy_protocol=haproxy 12525/inet/postscreen_cache_map=proxy:btree:\$data_directory/postscreen_12525_cache 12525/inet/syslog_name=postfix/smtpd-proxyprotocol
# Enable PROXY Protocol support:
# - Uses a different setting as port 25 is handled via the postscreen service
# - Optionally configure a `syslog_name` to distinguish in logs:
postconf -P \
12525/inet/postscreen_upstream_proxy_protocol=haproxy \
12525/inet/syslog_name=postfix/smtpd-proxyprotocol

# Add the `proxy:` prefix to share this cache between each running postscreen service via `proxymap`:
postconf 'postscreen_cache_map = proxy:btree:$data_directory/postscreen_cache'
{{- end }}

## The secrets key works the same way as the configs key. Use secrets to store sensitive information,
Expand Down