diff --git a/images/.utils/gitlab-ci.yaml b/images/.utils/gitlab-ci.yaml
index 0b108b01eb4b0bfa80f4a49e2521a945cc99aef1..f0fe731dd3fd0072559e37e7733e418e69f31bd7 100644
--- a/images/.utils/gitlab-ci.yaml
+++ b/images/.utils/gitlab-ci.yaml
@@ -50,6 +50,7 @@ container-build-dev:
rules:
- if: '$CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $CI_PIPELINE_SOURCE == "push"'
changes:
- - images/${IMAGE}/*
+ - images/${IMAGE}/**/*
- images/.utils/*
-
+ tags:
+ - kubernetes
diff --git a/images/postfix/config/main.cf b/images/postfix/config/main.cf
index 11281de1a6ff2b5572ffffe32d81ede4972205e9..248c2a8a121a30411f6d2e9ef15297fb4f1e58bc 100644
--- a/images/postfix/config/main.cf
+++ b/images/postfix/config/main.cf
@@ -87,9 +87,13 @@ virtual_transport = lmtp:inet:dovecot-internal:24
## Postscreen Configuration
##
+postscreen_upstream_proxy_protocol = haproxy
+postscreen_upstream_proxy_timeout = 5s
postscreen_access_list = permit_mynetworks
postscreen_blacklist_action = drop
postscreen_greet_action = ignore
+# Disable zombie detection
+postscreen_greet_banner =
postscreen_dnsbl_action = enforce
postscreen_dnsbl_threshold = 3
postscreen_dnsbl_allowlist_threshold = -1
@@ -172,5 +176,3 @@ maximal_queue_lifetime = 1d
bounce_queue_lifetime = 1d
unverified_recipient_reject_code = 577
compatibility_level = 2
-
-postscreen_upstream_proxy_protocol = haproxy
diff --git a/images/postfix/config/master.cf b/images/postfix/config/master.cf
index 3002042fae4a55cb5851682ccf94d33f09a321bc..c0ea1bccb071e92e848f90250120994178bcfbf4 100644
--- a/images/postfix/config/master.cf
+++ b/images/postfix/config/master.cf
@@ -3,11 +3,14 @@
# (yes) (yes) (yes) (never) (100)
# ==========================================================================
10025 inet n - - - 1 postscreen
+ -o postscreen_upstream_proxy_protocol=haproxy
+ -o syslog_name=postfix/10025
smtpd pass - - - - - smtpd
-o smtpd_tls_received_header=yes
-o content_filter=
+ -o smtpd_upstream_proxy_protocol=haproxy
dnsblog unix - - - - 0 dnsblog
-#tlsproxy unix - - - - 0 tlsproxy
+tlsproxy unix - - - - 0 tlsproxy
#smtps inet n - - - - smtpd
# -o syslog_name=postfix/smtps
# -o smtpd_tls_wrappermode=yes