diff --git a/charts/opendesk-jitsi/README.md b/charts/opendesk-jitsi/README.md index 532577e3326bf5f5da2a2da0d439f567ba5c4fec..3208ccd4f407790f46a7bfb27134bde470464ed3 100644 --- a/charts/opendesk-jitsi/README.md +++ b/charts/opendesk-jitsi/README.md @@ -115,7 +115,7 @@ helm install my-release --version 3.0.1 opendesk-jitsi/opendesk-jitsi | jitsi.prosody.securityContext.seccompProfile.type | string | `"RuntimeDefault"` | | | jitsi.publicURL | string | `"https://jitsi.mydomain.tld"` | | | jitsi.tz | string | `"Europe/Berlin"` | | -| jitsi.web.extraConfigJs.doNotStoreRoom | bool | `false` | | +| jitsi.web.extraConfig.doNotStoreRoom | bool | `false` | | | jitsi.web.extraEnvs.COLIBRI_WEBSOCKET_REGEX | string | `"[a-z0-9._-]+"` | | | jitsi.web.extraVolumeMounts[0].mountPath | string | `"/config/custom-config.js"` | | | jitsi.web.extraVolumeMounts[0].name | string | `"jitsi-meet-files"` | | diff --git a/charts/opendesk-jitsi/files/web/custom-config.js b/charts/opendesk-jitsi/files/web/custom-config.js index 4fb8dabc7c09c8ab97f26b8adca4e17faba57877..41fc38c7601eb327270db6a855bf7ffaec179bb5 100644 --- a/charts/opendesk-jitsi/files/web/custom-config.js +++ b/charts/opendesk-jitsi/files/web/custom-config.js @@ -7,5 +7,5 @@ config.disabledNotifications = [ config.disabledSounds = [ "INCOMING_MSG_SOUND", ]; -config.doNotStoreRoom = {{ .Values.jitsi.web.extraConfigJs.doNotStoreRoom }}; +config.doNotStoreRoom = {{ .Values.jitsi.web.extraConfig.doNotStoreRoom }}; config.dynamicBrandingUrl = "/static/branding.json"; diff --git a/charts/opendesk-jitsi/files/web/custom-interface_config.js b/charts/opendesk-jitsi/files/web/custom-interface_config.js index e546e080c6be9f426041d47ebcdba105389d1644..d96285fda75c714ba4d8bc5ffbd8cf1a66d5ec3f 100644 --- a/charts/opendesk-jitsi/files/web/custom-interface_config.js +++ b/charts/opendesk-jitsi/files/web/custom-interface_config.js @@ -11,7 +11,7 @@ interfaceConfig.DISPLAY_WELCOME_FOOTER = false; interfaceConfig.ENABLE_DIAL_OUT = false; interfaceConfig.GENERATE_ROOMNAMES_ON_WELCOME_PAGE = true; interfaceConfig.RECENT_LIST_ENABLED = - {{ not .Values.jitsi.web.extraConfigJs.doNotStoreRoom }}; + {{ not .Values.jitsi.web.extraConfig.doNotStoreRoom }}; interfaceConfig.SHOW_JITSI_WATERMARK = true; interfaceConfig.JITSI_WATERMARK_LINK = "https://{{ .Values.global.hosts.nubus }}.{{ .Values.global.domain }}"; diff --git a/charts/opendesk-jitsi/files/web/dialin-phone-numbers.json b/charts/opendesk-jitsi/files/web/dialin-phone-numbers.json index fc2d74397b4afa8ffdd47c2a1887e7ceef4bf1be..065a6511fa885724dbdf77f7f1a9175c932047f9 100644 --- a/charts/opendesk-jitsi/files/web/dialin-phone-numbers.json +++ b/charts/opendesk-jitsi/files/web/dialin-phone-numbers.json @@ -4,8 +4,8 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze SPDX-License-Identifier: Apache-2.0 */}} [ - {{- $countryCode := .Values.jitsi.web.extraConfigJs.dialinCountryCode }} - {{- $list := .Values.jitsi.web.extraConfigJs.dialinPhoneNumbers | default "" | split "," }} + {{- $countryCode := .Values.jitsi.web.extraConfig.dialinCountryCode }} + {{- $list := .Values.jitsi.web.extraConfig.dialinPhoneNumbers | default "" | split "," }} {{- $len := len $list }} {{- $i := 1 }} {{- range $key, $phone := $list }} diff --git a/charts/opendesk-jitsi/files/web/plugin.head.html b/charts/opendesk-jitsi/files/web/plugin.head.html index 9e3feec2061fcd7de70846523da96ea3d4a38e56..8635ef369a1a4b26fe64626d43327da4f2a503c3 100644 --- a/charts/opendesk-jitsi/files/web/plugin.head.html +++ b/charts/opendesk-jitsi/files/web/plugin.head.html @@ -69,7 +69,7 @@ SPDX-License-Identifier: Apache-2.0 } /* Set a border color for the recent meeting list if it is enabled */ - {{ if not .Values.jitsi.web.extraConfigJs.doNotStoreRoom }} + {{ if not .Values.jitsi.web.extraConfig.doNotStoreRoom }} .welcome .welcome-card--blue { background: unset; border-color: {{ .Values.theme.colors.primary }}; diff --git a/charts/opendesk-jitsi/values.yaml b/charts/opendesk-jitsi/values.yaml index 1b79ae51afad446e5ac9204b01c8de84009f3a6e..7a9e6f1616d2f5ea2b2fb57a0de380ade853e3c6 100644 --- a/charts/opendesk-jitsi/values.yaml +++ b/charts/opendesk-jitsi/values.yaml @@ -223,7 +223,7 @@ jitsi: image: tag: "stable-9955@sha256:23458904c9e9ff391df42567a3e667710754c584ab77db7abfe432a6ebd0fcec" pullPolicy: "IfNotPresent" - extraConfigJs: + extraConfig: doNotStoreRoom: false dialinCountryCode: "DE" dialinPhoneNumbers: ""