Skip to content

Commit 1a4479f

Browse files
committed
Corrects flags for smtp port w/ PROXY Protocol
1 parent 0dc44c1 commit 1a4479f

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

charts/docker-mailserver/tests/__snapshot__/configmap_test.yaml.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ manifest should match snapshot:
6464
# Create a variant for port 25 too (NOTE: Port 10025 is already assigned in DMS to Amavis):
6565
postconf -Mf smtp/inet | sed -e s/^smtp/12525/ >> /etc/postfix/master.cf
6666
# Enable PROXY Protocol support (different setting as port 25 is handled via postscreen), optionally configure a `syslog_name` to distinguish in logs:
67-
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/smtp-proxyprotocol
67+
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
6868
kind: ConfigMap
6969
metadata:
7070
labels:

charts/docker-mailserver/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,7 @@ configMaps:
591591
# Create a variant for port 25 too (NOTE: Port 10025 is already assigned in DMS to Amavis):
592592
postconf -Mf smtp/inet | sed -e s/^smtp/12525/ >> /etc/postfix/master.cf
593593
# Enable PROXY Protocol support (different setting as port 25 is handled via postscreen), optionally configure a `syslog_name` to distinguish in logs:
594-
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/smtp-proxyprotocol
594+
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
595595
{{- end }}
596596
597597
## The secrets key works the same way as the configs key. Use secrets to store sensitive information,

0 commit comments

Comments
 (0)