From b70b6368fc646a77b13549cb5429c290c5ea2b16 Mon Sep 17 00:00:00 2001
From: "mike.reiche" <mike@reiche.world>
Date: Fri, 9 Jan 2026 10:48:49 +0100
Subject: [PATCH 1/2] fix: Use http as internal port if ingress is enabled
 (#541)

---
 charts/mailu/templates/front/ingress.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/charts/mailu/templates/front/ingress.yaml b/charts/mailu/templates/front/ingress.yaml
index 491f8815..98bd56f8 100644
--- a/charts/mailu/templates/front/ingress.yaml
+++ b/charts/mailu/templates/front/ingress.yaml
@@ -19,6 +19,7 @@ metadata:
     {{- include "mailu.tplvalues.render" ( dict "value" .Values.commonAnnotations "context" $ ) | nindent 4 }}
     {{- end }}
 spec:
+  {{- $servicePort := ternary "http" "https" .Values.ingress.enabled }}
   {{- if .Values.ingress.ingressClassName }}
   ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
   {{- end }}
@@ -32,7 +33,7 @@ spec:
           {{- end }}
           - path: {{ $.Values.ingress.path }}
             pathType: {{ $.Values.ingress.pathType }}
-            backend: {{- include "mailu.ingress.backend" (dict "serviceName" (include "mailu.front.serviceName" $) "servicePort" "https" "context" $)  | nindent 14 }}
+            backend: {{- include "mailu.ingress.backend" (dict "serviceName" (include "mailu.front.serviceName" $) "servicePort" $servicePort "context" $)  | nindent 14 }}
     {{- end }}
     {{- range .Values.ingress.extraHosts }}
     - host: {{ .name | quote }}
@@ -40,7 +41,7 @@ spec:
         paths:
           - path: {{ default "/" .path }}
             pathType: {{ default "ImplementationSpecific" .pathType }}
-            backend: {{- include "mailu.ingress.backend" (dict "serviceName" (include "mailu.front.serviceName" $) "servicePort" "https" "context" $) | nindent 14 }}
+            backend: {{- include "mailu.ingress.backend" (dict "serviceName" (include "mailu.front.serviceName" $) "servicePort" $servicePort "context" $) | nindent 14 }}
     {{- end }}
     {{- if .Values.ingress.extraRules }}
     {{- include "mailu.tplvalues.render" (dict "value" .Values.ingress.extraRules "context" $) | nindent 4 }}

From ca0d33f74b9042e6d0f7f519f727f98b7c9458e5 Mon Sep 17 00:00:00 2001
From: "mike.reiche" <mike@reiche.world>
Date: Fri, 9 Jan 2026 10:49:11 +0100
Subject: [PATCH 2/2] feat: Allow rendering values for redis fqdn (#542)

---
 charts/mailu/templates/_services.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/mailu/templates/_services.tpl b/charts/mailu/templates/_services.tpl
index 8f5cecdf..e802fb3a 100644
--- a/charts/mailu/templates/_services.tpl
+++ b/charts/mailu/templates/_services.tpl
@@ -85,7 +85,7 @@ Service fqdn (within cluster) can be retrieved with `mailu.SERVICE.serviceFqdn`
     {{- if not .Values.externalRedis.host -}}
         {{- fail "externalRedis.host must be set when externalRedis.enabled is true" -}}
     {{- else -}}
-        {{- printf "%s" .Values.externalRedis.host -}}
+        {{- tpl (printf "%s" .Values.externalRedis.host) $ -}}
     {{- end -}}
 {{- else -}}
     {{- printf "%s.%s.svc.%s" (include "mailu.redis.serviceName" . ) (include "mailu.names.namespace" . ) (include "mailu.clusterDomain" . ) -}}