From 641c9c1cd4fee4f707b3f63b2de95c0c1488089f Mon Sep 17 00:00:00 2001 From: daimoc Date: Fri, 20 Dec 2024 16:40:17 +0100 Subject: [PATCH 1/4] Add Env parameter for etherpad random name generation in Jicofo --- docker-compose.yml | 1 + jicofo/rootfs/defaults/jicofo.conf | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index d0964e8513..52df2aaa8c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -362,6 +362,7 @@ services: - ENABLE_OCTO_SCTP - ENABLE_RECORDING - ENABLE_SCTP + - ENABLE_SHARED_DOCUMENT_RANDOM_NAME - ENABLE_TRANSCRIPTIONS - ENABLE_VISITORS - ENABLE_AUTO_LOGIN diff --git a/jicofo/rootfs/defaults/jicofo.conf b/jicofo/rootfs/defaults/jicofo.conf index 3bc8f0bf80..5a5183a172 100644 --- a/jicofo/rootfs/defaults/jicofo.conf +++ b/jicofo/rootfs/defaults/jicofo.conf @@ -12,6 +12,7 @@ {{ $ENABLE_AUTO_LOGIN := .Env.ENABLE_AUTO_LOGIN | default "1" | toBool -}} {{ $ENABLE_REST := .Env.JICOFO_ENABLE_REST | default "0" | toBool -}} {{ $ENABLE_JVB_XMPP_SERVER := .Env.ENABLE_JVB_XMPP_SERVER | default "0" | toBool -}} +{{ $ENABLE_SHARED_DOCUMENT_RANDOM_NAME := .Env.ENABLE_SHARED_DOCUMENT_RANDOM_NAME | default "0" | toBool -}} {{ $HEALTH_CHECKS_USE_PRESENCE := .Env.JICOFO_HEALTH_CHECKS_USE_PRESENCE | default "0" | toBool -}} {{ $JIBRI_BREWERY_MUC := .Env.JIBRI_BREWERY_MUC | default "jibribrewery" -}} {{ $JIGASI_BREWERY_MUC := .Env.JIGASI_BREWERY_MUC | default "jigasibrewery" -}} @@ -187,6 +188,10 @@ jicofo { enable-multi-stream-backward-compat = {{ .Env.JICOFO_MULTI_STREAM_BACKWARD_COMPAT | toBool }} {{ end }} + shared-document { + use-random-name = {{ .Env.ENABLE_SHARED_DOCUMENT_RANDOM_NAME | toBool }} + } + } {{ if .Env.JICOFO_ENABLE_HEALTH_CHECKS }} From b512697cae891ef3a3bf3896ec12dfde9ec9bab0 Mon Sep 17 00:00:00 2001 From: daimoc Date: Fri, 20 Dec 2024 16:48:02 +0100 Subject: [PATCH 2/4] Add conditional logic around ENABLE_SHARED_DOCUMENT_RANDOM_NAME --- jicofo/rootfs/defaults/jicofo.conf | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/jicofo/rootfs/defaults/jicofo.conf b/jicofo/rootfs/defaults/jicofo.conf index 5a5183a172..fc006abe6f 100644 --- a/jicofo/rootfs/defaults/jicofo.conf +++ b/jicofo/rootfs/defaults/jicofo.conf @@ -188,10 +188,12 @@ jicofo { enable-multi-stream-backward-compat = {{ .Env.JICOFO_MULTI_STREAM_BACKWARD_COMPAT | toBool }} {{ end }} + {{ if .Env.ENABLE_SHARED_DOCUMENT_RANDOM_NAME }} shared-document { use-random-name = {{ .Env.ENABLE_SHARED_DOCUMENT_RANDOM_NAME | toBool }} } - + {{ end }} + } {{ if .Env.JICOFO_ENABLE_HEALTH_CHECKS }} From 3771b57f2b782c91c7eb4d41851d789a8ab53d26 Mon Sep 17 00:00:00 2001 From: Damien Fetis Date: Fri, 20 Dec 2024 18:57:10 +0100 Subject: [PATCH 3/4] Update jicofo/rootfs/defaults/jicofo.conf Co-authored-by: Aaron van Meerten --- jicofo/rootfs/defaults/jicofo.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jicofo/rootfs/defaults/jicofo.conf b/jicofo/rootfs/defaults/jicofo.conf index fc006abe6f..8964bf3ad4 100644 --- a/jicofo/rootfs/defaults/jicofo.conf +++ b/jicofo/rootfs/defaults/jicofo.conf @@ -188,7 +188,7 @@ jicofo { enable-multi-stream-backward-compat = {{ .Env.JICOFO_MULTI_STREAM_BACKWARD_COMPAT | toBool }} {{ end }} - {{ if .Env.ENABLE_SHARED_DOCUMENT_RANDOM_NAME }} + {{ if $ENABLE_SHARED_DOCUMENT_RANDOM_NAME }} shared-document { use-random-name = {{ .Env.ENABLE_SHARED_DOCUMENT_RANDOM_NAME | toBool }} } From e15287c4057f97dff6b14d780b5589b7c4fc8ad2 Mon Sep 17 00:00:00 2001 From: daimoc Date: Mon, 23 Dec 2024 00:56:07 +0100 Subject: [PATCH 4/4] Use ENABLE_SHARED_DOCUMENT_RANDOM_NAME variable --- jicofo/rootfs/defaults/jicofo.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jicofo/rootfs/defaults/jicofo.conf b/jicofo/rootfs/defaults/jicofo.conf index 8964bf3ad4..ed720a51a5 100644 --- a/jicofo/rootfs/defaults/jicofo.conf +++ b/jicofo/rootfs/defaults/jicofo.conf @@ -190,7 +190,7 @@ jicofo { {{ if $ENABLE_SHARED_DOCUMENT_RANDOM_NAME }} shared-document { - use-random-name = {{ .Env.ENABLE_SHARED_DOCUMENT_RANDOM_NAME | toBool }} + use-random-name = {{ $ENABLE_SHARED_DOCUMENT_RANDOM_NAME }} } {{ end }}