Skip to content

Commit

Permalink
Merge pull request #79 from vector-im/bbz/jitsi-well-known-content-type
Browse files Browse the repository at this point in the history
UVS: serve well-known file as application/json
  • Loading branch information
benbz authored Sep 5, 2023
2 parents a4f107b + e6e2b54 commit 68f7c55
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 14 deletions.
14 changes: 14 additions & 0 deletions templates/uvs-extra-web.yaml
Original file line number Diff line number Diff line change
@@ -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 -}}
10 changes: 0 additions & 10 deletions templates/uvs-wellknown.yaml

This file was deleted.

13 changes: 9 additions & 4 deletions templates/web-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down

0 comments on commit 68f7c55

Please sign in to comment.