From ee2b082664e6828c885359f1c4973f27c4c4e3ad Mon Sep 17 00:00:00 2001
From: Thomas Kaltenbrunner <tom@kaltenbrunner.it>
Date: Tue, 15 Jul 2025 21:02:56 +0200
Subject: [PATCH] fix(open-xchange): Postfix to support submissions and
 external secrets

---
 .../open-xchange/values-postfix.yaml.gotmpl   | 16 +++++++++++-----
 .../values-postfix.yaml.gotmpl                | 19 ++++++++++++-------
 .../environments/default/charts.yaml.gotmpl   |  2 +-
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/helmfile/apps/open-xchange/values-postfix.yaml.gotmpl b/helmfile/apps/open-xchange/values-postfix.yaml.gotmpl
index 0e4832d1..09a40e6d 100644
--- a/helmfile/apps/open-xchange/values-postfix.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-postfix.yaml.gotmpl
@@ -46,10 +46,6 @@ postfix:
   hostname: "postfix"
   inetProtocols: "ipv4"
   milterDefaultAction: "tempfail"
-  overrides:
-    - fileName: "sasl_passwd.map"
-      content:
-        - {{ printf "%s %s:%s" .Values.smtp.host .Values.smtp.username .Values.smtp.password | quote }}
   {{- if .Values.apps.dkimpy.enabled }}
   dkimpyHost: "opendesk-dkimpy-milter.{{ .Release.Namespace }}.svc.{{.Values.cluster.networking.domain }}:8892"
   {{- end }}
@@ -58,7 +54,17 @@ postfix:
   smtpdTLSMandatoryCiphers: "high"
 
   rspamdHost: ""
-  relayHost: {{ if .Values.smtp.host }}{{ printf "[%s]:%d" .Values.smtp.host .Values.smtp.port | quote }}{{ else }}""{{ end }}
+  {{- if .Values.smtp.host }}
+  relayHost:
+    enabled: true
+    host: {{ .Values.smtp.host }}
+    port: {{ .Values.smtp.port }}
+    authentication:
+      username:
+        value: {{ .Values.smtp.username }}
+      password:
+        value: {{ .Values.smtp.password }}
+  {{- end }}
   allowRelayNets: false
   smtpSASLAuthEnable: "yes"
   smtpSASLPasswordMaps: "lmdb:/etc/postfix/sasl_passwd.map"
diff --git a/helmfile/apps/services-external/values-postfix.yaml.gotmpl b/helmfile/apps/services-external/values-postfix.yaml.gotmpl
index 02592de3..4fc41c1b 100644
--- a/helmfile/apps/services-external/values-postfix.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-postfix.yaml.gotmpl
@@ -54,19 +54,24 @@ postfix:
   hostname: "postfix"
   inetProtocols: "ipv4"
   milterDefaultAction: "accept"
-  overrides:
-    - fileName: "sasl_passwd.map"
-      content:
-        - {{ printf "%s %s:%s" .Values.smtp.host .Values.smtp.username .Values.smtp.password | quote }}
   {{- if .Values.apps.dkimpy.enabled }}
   dkimpyHost: "opendesk-dkimpy-milter.{{ .Release.Namespace }}.svc.{{.Values.cluster.networking.domain }}:8892"
   {{- end }}
   rspamdHost: ""
-  relayHost: {{ if .Values.smtp.host }}{{ printf "[%s]:%d" .Values.smtp.host .Values.smtp.port | quote }}{{ else }}""{{ end }}
-
+  {{- if .Values.smtp.host }}
+  relayHost:
+    enabled: true
+    host: {{ .Values.smtp.host }}
+    port: {{ .Values.smtp.port }}
+    authentication:
+      username:
+        value: {{ .Values.smtp.username }}
+      password:
+        value: {{ .Values.smtp.password }}
+  {{- end }}
   # Warning: This setting allows unauthenticated mail relay from relayNets!
-  relayNets: {{ join " " .Values.cluster.networking.cidr | quote }}
   allowRelayNets: true
+  relayNets: {{ join " " .Values.cluster.networking.cidr | quote }}
 
   minTLSVersion: "TLSv1.3"
   smtpdTLSMandatoryCiphers: "high"
diff --git a/helmfile/environments/default/charts.yaml.gotmpl b/helmfile/environments/default/charts.yaml.gotmpl
index c0e4bcd8..b81d7ea1 100644
--- a/helmfile/environments/default/charts.yaml.gotmpl
+++ b/helmfile/environments/default/charts.yaml.gotmpl
@@ -429,7 +429,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-postfix"
     name: "postfix"
-    version: "4.0.0"
+    version: "5.0.0"
     verify: true
   postgresql:
     # providerCategory: "Platform"