From a1eb857134b5effb923545e71f90aaae82432136 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Sun, 1 May 2022 02:45:20 +0200
Subject: [PATCH] feat: simplify to autodiscover ingress
---
templates/deploy-autodiscover.yaml | 2 --
templates/ingress-autodiscover.yaml | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/templates/deploy-autodiscover.yaml b/templates/deploy-autodiscover.yaml
index 5e268bc..b252d78 100644
--- a/templates/deploy-autodiscover.yaml
+++ b/templates/deploy-autodiscover.yaml
@@ -46,8 +46,6 @@ spec:
volumeMounts:
- name: config
mountPath: "/usr/share/nginx/html"
- - name: config
- mountPath: "/usr/share/nginx/html/mail"
startupProbe:
httpGet:
path: /config-v1.1.xml
diff --git a/templates/ingress-autodiscover.yaml b/templates/ingress-autodiscover.yaml
index a5df63c..a6f4e7b 100644
--- a/templates/ingress-autodiscover.yaml
+++ b/templates/ingress-autodiscover.yaml
@@ -11,6 +11,8 @@ 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 }}
{{- end }}
--
GitLab