From 10b4a4e62447d9860ee3f1d429dc80578e6868ba Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Sun, 1 May 2022 03:00:25 +0200
Subject: [PATCH] feat: fix issue with autodiscover ingress
---
templates/deploy-autodiscover.yaml | 7 +++++++
templates/ingress-autodiscover.yaml | 1 -
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/templates/deploy-autodiscover.yaml b/templates/deploy-autodiscover.yaml
index b252d78..9bfa810 100644
--- a/templates/deploy-autodiscover.yaml
+++ b/templates/deploy-autodiscover.yaml
@@ -31,6 +31,13 @@ spec:
- name: config
configMap:
name: {{ include "mailu-helm.fullname" . }}-autodiscover
+ items:
+ - key: mta-sts.txt
+ path: ".well-known/mta-sts.txt"
+ - key: config-v1.1.xml
+ path: config-v1.1.xml
+ - key: autodiscover.xml
+ path: autodiscover.xml
containers:
- name: autodiscover
securityContext:
diff --git a/templates/ingress-autodiscover.yaml b/templates/ingress-autodiscover.yaml
index a6f4e7b..b51a5c3 100644
--- a/templates/ingress-autodiscover.yaml
+++ b/templates/ingress-autodiscover.yaml
@@ -11,7 +11,6 @@ metadata:
nginx.ingress.kubernetes.io/cache-whitelist-query-params: ""
nginx.ingress.kubernetes.io/configuration-snippet: |-
rewrite ^/.well-known/(carddav|caldav)$ "https://{{ .Values.webdav.host }}{{ .Values.webdav.path }}" permanent;
- rewrite ^/.well-known/(.*) /$1 last;
rewrite ^/mail/(.*) /$1 last;
{{- range $key, $value := .Values.ingress.annotations }}
{{- printf "%s: %s" $key (tpl $value $ | quote) | nindent 4 }}
--
GitLab