From c3bbfa7666b66e193827424d54b339b0d53fe658 Mon Sep 17 00:00:00 2001 From: Uwe Koloska Date: Mon, 25 May 2020 09:38:16 +0200 Subject: [PATCH 1/2] video: create persistent internal user --- team-video/templates/deploy_prosody.yaml | 12 ++++++++++-- team-video/values.yaml | 6 +++--- values-video.yaml | 6 +++--- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/team-video/templates/deploy_prosody.yaml b/team-video/templates/deploy_prosody.yaml index 69da902..6e42ef2 100644 --- a/team-video/templates/deploy_prosody.yaml +++ b/team-video/templates/deploy_prosody.yaml @@ -29,7 +29,15 @@ spec: lifecycle: postStart: exec: - command: ["/bin/bash", "-c", "sleep 60; prosodyctl --config /config/prosody.cfg.lua register {{ .Values.auth.admin.user }} {{ .Values.app.name }}.{{ .Values.app.domain }} {{ .Values.auth.admin.password }}"] + command: + - "/bin/bash" + - "-c" + - |- + sleep 60 + {{- $app := .Values.app }} + {{- range .Values.auth.users }} + prosodyctl --config /config/prosody.cfg.lua register {{ .name }} {{ $app.name }}.{{ $app.domain }} {{ .password }} + {{- end }} {{end}} image: jitsi/prosody imagePullPolicy: {{ .Values.app.pullpolicy }} @@ -71,4 +79,4 @@ spec: - name: XMPP_INTERNAL_MUC_DOMAIN value: internal-muc.{{ .Values.app.name }}.{{ .Values.app.domain }} - name: TZ - value: Europe/Paris \ No newline at end of file + value: Europe/Paris diff --git a/team-video/values.yaml b/team-video/values.yaml index 9f4c3d8..c836b46 100644 --- a/team-video/values.yaml +++ b/team-video/values.yaml @@ -7,9 +7,9 @@ auth: enabled: false guests: true type: "internal" - admin: - user: admin - password: "jitsiAdmin" + users: + - name: admin + password: "jitsiAdmin" logLevel: "info" hideWelcomePage: true diff --git a/values-video.yaml b/values-video.yaml index df3691a..8a9e18f 100644 --- a/values-video.yaml +++ b/values-video.yaml @@ -8,9 +8,9 @@ auth: guests: true # internal auth type: internal - admin: - user: admin - password: "jitsiAdmin" + users: + - user: admin + password: "jitsiAdmin" # ldap auth - remove above "type: internal" auth to use it #type: ldap #ldapauthmethod: bind From a5c2535439f0b6635aecb7ee53e7142ed0ed0541 Mon Sep 17 00:00:00 2001 From: Uwe Koloska Date: Fri, 9 Apr 2021 20:23:47 +0200 Subject: [PATCH 2/2] video: fix parameter name in sample values --- values-video.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/values-video.yaml b/values-video.yaml index 8a9e18f..c46be52 100644 --- a/values-video.yaml +++ b/values-video.yaml @@ -9,7 +9,7 @@ auth: # internal auth type: internal users: - - user: admin + - name: admin password: "jitsiAdmin" # ldap auth - remove above "type: internal" auth to use it #type: ldap