From 164d28b2ee03951fd103f21d767257fc4a1f2843 Mon Sep 17 00:00:00 2001 From: Debendra Oli Date: Thu, 4 Aug 2022 21:19:21 +0545 Subject: [PATCH] web: migrate deprecated recordings options, add some more * config: migrate depricated recordings options, add localRecording section and disableProfile * fix: disableProfile * group recording config, remove boolean conditions * config add: localRecording extra options --- docker-compose.yml | 7 ++++-- web/rootfs/defaults/settings-config.js | 31 +++++++++++++++----------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 80750c1..9695a8f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,8 +40,10 @@ services: - DISABLE_GRANT_MODERATOR - DISABLE_HTTPS - DISABLE_KICKOUT + - DISABLE_LOCAL_RECORDING - DISABLE_POLLS - DISABLE_PRIVATE_CHAT + - DISABLE_PROFILE - DISABLE_REACTIONS - DISABLE_REMOTE_VIDEO_MENU - DROPBOX_APPKEY @@ -53,8 +55,7 @@ services: - ENABLE_CALENDAR - ENABLE_COLIBRI_WEBSOCKET - ENABLE_E2EPING - - ENABLE_FILE_RECORDING_SERVICE - - ENABLE_FILE_RECORDING_SERVICE_SHARING + - ENABLE_FILE_RECORDING_SHARING - ENABLE_GUESTS - ENABLE_HSTS - ENABLE_HTTP_REDIRECT @@ -68,6 +69,8 @@ services: - ENABLE_P2P - ENABLE_WELCOME_PAGE - ENABLE_CLOSE_PAGE + - ENABLE_LOCAL_RECORDING_NOTIFY_ALL_PARTICIPANT + - ENABLE_LOCAL_RECORDING_SELF_START - ENABLE_RECORDING - ENABLE_REMB - ENABLE_REQUIRE_DISPLAY_NAME diff --git a/web/rootfs/defaults/settings-config.js b/web/rootfs/defaults/settings-config.js index 7433cf4..2417ee3 100644 --- a/web/rootfs/defaults/settings-config.js +++ b/web/rootfs/defaults/settings-config.js @@ -2,8 +2,7 @@ {{ $ENABLE_AUDIO_PROCESSING := .Env.ENABLE_AUDIO_PROCESSING | default "true" | toBool -}} {{ $ENABLE_BREAKOUT_ROOMS := .Env.ENABLE_BREAKOUT_ROOMS | default "true" | toBool -}} {{ $ENABLE_CALENDAR := .Env.ENABLE_CALENDAR | default "false" | toBool -}} -{{ $ENABLE_FILE_RECORDING_SERVICE := .Env.ENABLE_FILE_RECORDING_SERVICE | default "false" | toBool -}} -{{ $ENABLE_FILE_RECORDING_SERVICE_SHARING := .Env.ENABLE_FILE_RECORDING_SERVICE_SHARING | default "false" | toBool -}} +{{ $ENABLE_FILE_RECORDING_SHARING := .Env.ENABLE_FILE_RECORDING_SHARING | default "false" | toBool -}} {{ $ENABLE_IPV6 := .Env.ENABLE_IPV6 | default "true" | toBool -}} {{ $ENABLE_LIPSYNC := .Env.ENABLE_LIPSYNC | default "false" | toBool -}} {{ $ENABLE_NO_AUDIO_DETECTION := .Env.ENABLE_NO_AUDIO_DETECTION | default "true" | toBool -}} @@ -52,6 +51,10 @@ {{ $DISABLE_KICKOUT := .Env.DISABLE_KICKOUT | default "false" | toBool -}} {{ $DISABLE_GRANT_MODERATOR := .Env.DISABLE_GRANT_MODERATOR | default "false" | toBool -}} {{ $ENABLE_E2EPING := .Env.ENABLE_E2EPING | default "false" | toBool -}} +{{ $DISABLE_LOCAL_RECORDING := .Env.DISABLE_LOCAL_RECORDING | default "false" | toBool -}} +{{ $ENABLE_LOCAL_RECORDING_NOTIFY_ALL_PARTICIPANT := .Env.ENABLE_LOCAL_RECORDING_NOTIFY_ALL_PARTICIPANT | default "false" | toBool -}} +{{ $ENABLE_LOCAL_RECORDING_SELF_START := .Env.ENABLE_LOCAL_RECORDING_SELF_START | default "false" | toBool -}} +{{ $DISABLE_PROFILE := .Env.DISABLE_PROFILE | default "false" | toBool -}} // Video configuration. @@ -134,8 +137,10 @@ config.etherpad_base = '{{ $PUBLIC_URL }}/etherpad/p/'; config.hiddenDomain = '{{ $XMPP_RECORDER_DOMAIN }}'; +if (!config.hasOwnProperty('recordingService')) config.recordingService = {}; + // Whether to enable file recording or not -config.fileRecordingsEnabled = true; +config.recordingService.enabled = true; // Whether to enable live streaming or not. config.liveStreamingEnabled = true; @@ -152,22 +157,20 @@ config.dropbox.redirectURI = '{{ .Env.DROPBOX_REDIRECT_URI }}'; {{ end -}} {{ end -}} -{{ if $ENABLE_FILE_RECORDING_SERVICE -}} -// When integrations like dropbox are enabled only that will be shown, -// by enabling fileRecordingsServiceEnabled, we show both the integrations -// and the generic recording service (its configuration and storage type -// depends on jibri configuration) -config.fileRecordingsServiceEnabled = true; -{{ end -}} -{{ if $ENABLE_FILE_RECORDING_SERVICE_SHARING -}} // Whether to show the possibility to share file recording with other people // (e.g. meeting participants), based on the actual implementation // on the backend. -config.fileRecordingsServiceSharingEnabled = true; -{{ end -}} +config.recordingService.sharingEnabled = $ENABLE_FILE_RECORDING_SHARING; {{ end -}} +// Local recording configuration. +if (!config.hasOwnProperty('localRecording')) config.localRecording = {}; +config.localRecording.disable = $DISABLE_LOCAL_RECORDING; +config.localRecording.notifyAllParticipants = $ENABLE_LOCAL_RECORDING_NOTIFY_ALL_PARTICIPANT; +config.localRecording.disableSelfRecording = $ENABLE_LOCAL_RECORDING_SELF_START; + + // Analytics. // @@ -307,6 +310,8 @@ config.requireDisplayName = {{ $ENABLE_REQUIRE_DISPLAY_NAME }}; config.chromeExtensionBanner = {{ .Env.CHROME_EXTENSION_BANNER_JSON }}; {{ end -}} +// Disables profile and the edit of all fields from the profile settings (display name and email) +config.disableProfile = $DISABLE_PROFILE; // Advanced. //