Skip to content

Commit c2f01f3

Browse files
emrahcomsaghul
authored andcommitted
web: update livestreaming settings according to new config.js
1 parent e4c8c2a commit c2f01f3

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

docker-compose.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ services:
7474
- ENABLE_WELCOME_PAGE
7575
- ENABLE_CLOSE_PAGE
7676
- ENABLE_LIVESTREAMING
77+
- ENABLE_LIVESTREAMING_DATA_PRIVACY_LINK
78+
- ENABLE_LIVESTREAMING_HELP_LINK
79+
- ENABLE_LIVESTREAMING_TERMS_LINK
80+
- ENABLE_LIVESTREAMING_VALIDATOR_REGEXP_STRING
7781
- ENABLE_LOCAL_RECORDING_NOTIFY_ALL_PARTICIPANT
7882
- ENABLE_LOCAL_RECORDING_SELF_START
7983
- ENABLE_RECORDING

web/rootfs/defaults/settings-config.js

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
{{ $ENABLE_RECORDING := .Env.ENABLE_RECORDING | default "false" | toBool -}}
1414
{{ $ENABLE_SERVICE_RECORDING := .Env.ENABLE_SERVICE_RECORDING | default ($ENABLE_RECORDING | printf "%t") | toBool -}}
1515
{{ $ENABLE_LIVESTREAMING := .Env.ENABLE_LIVESTREAMING | default "false" | toBool -}}
16+
{{ $ENABLE_LIVESTREAMING_DATA_PRIVACY_LINK := .Env.ENABLE_LIVESTREAMING_DATA_PRIVACY_LINK | default "https://policies.google.com/privacy" -}}
17+
{{ $ENABLE_LIVESTREAMING_HELP_LINK := .Env.ENABLE_LIVESTREAMING_HELP_LINK | default "https://jitsi.org/live" -}}
18+
{{ $ENABLE_LIVESTREAMING_TERMS_LINK := .Env.ENABLE_LIVESTREAMING_TERMS_LINK | default "https://www.youtube.com/t/terms" -}}
19+
{{ $ENABLE_LIVESTREAMING_VALIDATOR_REGEXP_STRING := .Env.ENABLE_LIVESTREAMING_VALIDATOR_REGEXP_STRING | default "^(?:[a-zA-Z0-9]{4}(?:-(?!$)|$)){4}" -}}
1620
{{ $ENABLE_REMB := .Env.ENABLE_REMB | default "true" | toBool -}}
1721
{{ $ENABLE_REQUIRE_DISPLAY_NAME := .Env.ENABLE_REQUIRE_DISPLAY_NAME | default "false" | toBool -}}
1822
{{ $ENABLE_SIMULCAST := .Env.ENABLE_SIMULCAST | default "true" | toBool -}}
@@ -153,8 +157,18 @@ if (!config.hasOwnProperty('recordingService')) config.recordingService = {};
153157
// Whether to enable file recording or not using the "service" defined by the finalizer in Jibri
154158
config.recordingService.enabled = {{ $ENABLE_SERVICE_RECORDING }};
155159

156-
// Whether to enable live streaming or not.
157-
config.liveStreamingEnabled = {{ $ENABLE_LIVESTREAMING }};
160+
// Whether to show the possibility to share file recording with other people
161+
// (e.g. meeting participants), based on the actual implementation
162+
// on the backend.
163+
config.recordingService.sharingEnabled = {{ $ENABLE_FILE_RECORDING_SHARING }};
164+
165+
// Live streaming configuration.
166+
if (!config.hasOwnProperty('liveStreaming')) config.liveStreaming = {};
167+
config.liveStreaming.enabled = {{ $ENABLE_LIVESTREAMING }};
168+
config.liveStreaming.dataPrivacyLink= '{{ $ENABLE_LIVESTREAMING_DATA_PRIVACY_LINK }}';
169+
config.liveStreaming.helpLink= '{{ $ENABLE_LIVESTREAMING_HELP_LINK }}';
170+
config.liveStreaming.termsLink= '{{ $ENABLE_LIVESTREAMING_TERMS_LINK }}';
171+
config.liveStreaming.validatorRegExpString= '{{ $ENABLE_LIVESTREAMING_VALIDATOR_REGEXP_STRING }}';
158172

159173
{{ if .Env.DROPBOX_APPKEY -}}
160174
// Enable the dropbox integration.
@@ -167,11 +181,6 @@ config.dropbox.appKey = '{{ .Env.DROPBOX_APPKEY }}';
167181
config.dropbox.redirectURI = '{{ .Env.DROPBOX_REDIRECT_URI }}';
168182
{{ end -}}
169183
{{ end -}}
170-
171-
// Whether to show the possibility to share file recording with other people
172-
// (e.g. meeting participants), based on the actual implementation
173-
// on the backend.
174-
config.recordingService.sharingEnabled = {{ $ENABLE_FILE_RECORDING_SHARING }};
175184
{{ end -}}
176185

177186

@@ -468,4 +477,4 @@ config.e2eping.maxMessagePerSecond = {{ .Env.E2EPING_MAX_MESSAGE_PER_SECOND }};
468477
// Settings for the Excalidraw whiteboard integration.
469478
if (!config.hasOwnProperty('whiteboard')) config.whiteboard = {};
470479
config.whiteboard.enabled = {{ $WHITEBOARD_ENABLED }};
471-
config.whiteboard.collabServerBaseUrl = '{{ $WHITEBOARD_COLLAB_SERVER_PUBLIC_URL }}';
480+
config.whiteboard.collabServerBaseUrl = '{{ $WHITEBOARD_COLLAB_SERVER_PUBLIC_URL }}';

0 commit comments

Comments
 (0)