From e6e2b544e872b63b2979223675ba61b6582897d4 Mon Sep 17 00:00:00 2001
From: Ben Banfield-Zanin <benbz@matrix.org>
Date: Tue, 5 Sep 2023 14:28:12 +0100
Subject: [PATCH] UVS: serve well-known file as application/json

---
 templates/uvs-extra-web.yaml  | 14 ++++++++++++++
 templates/uvs-wellknown.yaml  | 10 ----------
 templates/web-deployment.yaml | 13 +++++++++----
 3 files changed, 23 insertions(+), 14 deletions(-)
 create mode 100644 templates/uvs-extra-web.yaml
 delete mode 100644 templates/uvs-wellknown.yaml

diff --git a/templates/uvs-extra-web.yaml b/templates/uvs-extra-web.yaml
new file mode 100644
index 0000000..7598a36
--- /dev/null
+++ b/templates/uvs-extra-web.yaml
@@ -0,0 +1,14 @@
+{{ if $.Values.uvs.enable -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "jitsi.name" $ }}-uvs-extra-web
+  namespace: {{ $.Release.Namespace }}
+  labels: {{ include "jitsi.uvs.labels" $ | nindent 4 }}
+data:
+  well-known: "{\"auth\": \"openidtoken-jwt\"}"
+  custom-meet.conf: |
+    location = /.well-known/element/jitsi {
+        default_type application/json;
+    }
+{{ end -}}
diff --git a/templates/uvs-wellknown.yaml b/templates/uvs-wellknown.yaml
deleted file mode 100644
index b97aa76..0000000
--- a/templates/uvs-wellknown.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-{{ if $.Values.uvs.enable -}}
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "jitsi.name" $ }}-uvs-wellknown
-  namespace: {{ $.Release.Namespace }}
-  labels: {{ include "jitsi.uvs.labels" $ | nindent 4 }}
-data:
-  jitsi: "{\"auth\": \"openidtoken-jwt\"}"
-{{ end -}}
diff --git a/templates/web-deployment.yaml b/templates/web-deployment.yaml
index 02f27ae..326f9fa 100644
--- a/templates/web-deployment.yaml
+++ b/templates/web-deployment.yaml
@@ -139,9 +139,14 @@ spec:
           subPath: watermark.png
         {{ end }}
         {{- if $.Values.uvs.enable }}
-        - mountPath: /usr/share/jitsi-meet/.well-known/element
-          name: uvs-wellknown
+        - mountPath: /usr/share/jitsi-meet/.well-known/element/jitsi
+          name: uvs-extra-web
           readOnly: true
+          subPath: well-known
+        - mountPath: /config/nginx/custom-meet.conf
+          name: uvs-extra-web
+          readOnly: true
+          subPath: custom-meet.conf
         {{- end }}
       {{- if $.Values.web.extraVolumeMounts }}
         {{- toYaml $.Values.web.extraVolumeMounts | nindent 8 }}
@@ -192,8 +197,8 @@ spec:
       {{ end }}
       {{- if $.Values.uvs.enable }}
       - configMap:
-          name: {{ include "jitsi.name" $ }}-uvs-wellknown
-        name: uvs-wellknown
+          name: {{ include "jitsi.name" $ }}-uvs-extra-web
+        name: uvs-extra-web
       {{- end }}
     {{- if $.Values.web.extraVolumes }}
       {{- toYaml $.Values.web.extraVolumes | nindent 6 }}