From a7f260ec32573b65ffc73b3ff13066a4c3781787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Tue, 14 Jun 2022 11:30:06 +0200 Subject: [PATCH] web,etherpad: fix default public URL --- web/rootfs/defaults/settings-config.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/rootfs/defaults/settings-config.js b/web/rootfs/defaults/settings-config.js index 9765c4a..db54e26 100644 --- a/web/rootfs/defaults/settings-config.js +++ b/web/rootfs/defaults/settings-config.js @@ -22,6 +22,7 @@ {{ $ENABLE_TCC := .Env.ENABLE_TCC | default "true" | toBool -}} {{ $ENABLE_TRANSCRIPTIONS := .Env.ENABLE_TRANSCRIPTIONS | default "false" | toBool -}} {{ $ENABLE_JAAS_COMPONENTS := .Env.ENABLE_JAAS_COMPONENTS | default "0" | toBool }} +{{ $PUBLIC_URL := .Env.PUBLIC_URL | default "https://localhost:8443" -}} {{ $RESOLUTION := .Env.RESOLUTION | default "720" -}} {{ $RESOLUTION_MIN := .Env.RESOLUTION_MIN | default "180" -}} {{ $RESOLUTION_WIDTH := .Env.RESOLUTION_WIDTH | default "1280" -}} @@ -114,7 +115,7 @@ config.hideAddRoomButton = {{ $ENABLE_BREAKOUT_ROOMS | not }}; {{ if .Env.ETHERPAD_PUBLIC_URL -}} config.etherpad_base = '{{ .Env.ETHERPAD_PUBLIC_URL }}'; {{ else if .Env.ETHERPAD_URL_BASE -}} -config.etherpad_base = '{{.Env.PUBLIC_URL}}/etherpad/p/'; +config.etherpad_base = '{{ $PUBLIC_URL }}/etherpad/p/'; {{ end -}}