web,etherpad: fix default public URL
This commit is contained in:
@@ -22,6 +22,7 @@
|
|||||||
{{ $ENABLE_TCC := .Env.ENABLE_TCC | default "true" | toBool -}}
|
{{ $ENABLE_TCC := .Env.ENABLE_TCC | default "true" | toBool -}}
|
||||||
{{ $ENABLE_TRANSCRIPTIONS := .Env.ENABLE_TRANSCRIPTIONS | default "false" | toBool -}}
|
{{ $ENABLE_TRANSCRIPTIONS := .Env.ENABLE_TRANSCRIPTIONS | default "false" | toBool -}}
|
||||||
{{ $ENABLE_JAAS_COMPONENTS := .Env.ENABLE_JAAS_COMPONENTS | default "0" | 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 := .Env.RESOLUTION | default "720" -}}
|
||||||
{{ $RESOLUTION_MIN := .Env.RESOLUTION_MIN | default "180" -}}
|
{{ $RESOLUTION_MIN := .Env.RESOLUTION_MIN | default "180" -}}
|
||||||
{{ $RESOLUTION_WIDTH := .Env.RESOLUTION_WIDTH | default "1280" -}}
|
{{ $RESOLUTION_WIDTH := .Env.RESOLUTION_WIDTH | default "1280" -}}
|
||||||
@@ -114,7 +115,7 @@ config.hideAddRoomButton = {{ $ENABLE_BREAKOUT_ROOMS | not }};
|
|||||||
{{ if .Env.ETHERPAD_PUBLIC_URL -}}
|
{{ if .Env.ETHERPAD_PUBLIC_URL -}}
|
||||||
config.etherpad_base = '{{ .Env.ETHERPAD_PUBLIC_URL }}';
|
config.etherpad_base = '{{ .Env.ETHERPAD_PUBLIC_URL }}';
|
||||||
{{ else if .Env.ETHERPAD_URL_BASE -}}
|
{{ else if .Env.ETHERPAD_URL_BASE -}}
|
||||||
config.etherpad_base = '{{.Env.PUBLIC_URL}}/etherpad/p/';
|
config.etherpad_base = '{{ $PUBLIC_URL }}/etherpad/p/';
|
||||||
{{ end -}}
|
{{ end -}}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user