Skip to content

Commit 2a91d8e

Browse files
authored
jibri: fix ENABLE_RECORDING issue
* Fixing ENABLE_RECORDING issue In jitsi/docker-jitsi-meet#1372, I made a change to allow the web component to set ENABLE_RECORDING and still enable recording (in order to have "service recording" disabled but Dropbox recording enabled. I failed to notice that the ENABLE_RECORDING environment variable is also used in Prosody (and in a number of places) as a global switch. With the new variable semantic (as proposed in #1372), in order to know if Jibri must be enabled or not, we need 3 variables (ENABLE_RECORDING, DROPBOX_APPKEY and ENABLE_LIVESTREAMING). This means we should also propagate those variables to Prosody. To be honest, having the "DROPBOX_APPKEY" forwarded to Prosody just to know if we should enable or disable recording is a bit weird. So I feel it is a better idea to revert back the meaning of "ENABLE_RECORDING" to be a global switch. I'm therefore reverting back to old behaviour and adding a new environment variable (ENABLE_SERVICE_RECORDING) that allows turning on or off the "service recording". * Setting ENABLE_SERVICE_RECORDING default value to ENABLE_SERVICE_RECORDING
1 parent c6832d7 commit 2a91d8e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ services:
7575
- ENABLE_RECORDING
7676
- ENABLE_REMB
7777
- ENABLE_REQUIRE_DISPLAY_NAME
78+
- ENABLE_SERVICE_RECORDING
7879
- ENABLE_SIMULCAST
7980
- ENABLE_STATS_ID
8081
- ENABLE_STEREO

web/rootfs/defaults/settings-config.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
{{ $ENABLE_WELCOME_PAGE := .Env.ENABLE_WELCOME_PAGE | default "true" | toBool -}}
1212
{{ $ENABLE_CLOSE_PAGE := .Env.ENABLE_CLOSE_PAGE | default "false" | toBool -}}
1313
{{ $ENABLE_RECORDING := .Env.ENABLE_RECORDING | default "false" | toBool -}}
14+
{{ $ENABLE_SERVICE_RECORDING := .Env.ENABLE_SERVICE_RECORDING | default ($ENABLE_RECORDING | printf "%t") | toBool -}}
1415
{{ $ENABLE_LIVESTREAMING := .Env.ENABLE_LIVESTREAMING | default "false" | toBool -}}
1516
{{ $ENABLE_REMB := .Env.ENABLE_REMB | default "true" | toBool -}}
1617
{{ $ENABLE_REQUIRE_DISPLAY_NAME := .Env.ENABLE_REQUIRE_DISPLAY_NAME | default "false" | toBool -}}
@@ -136,14 +137,14 @@ config.etherpad_base = '{{ $PUBLIC_URL }}/etherpad/p/';
136137
// Recording.
137138
//
138139

139-
{{ if or $ENABLE_RECORDING .Env.DROPBOX_APPKEY $ENABLE_LIVESTREAMING -}}
140+
{{ if $ENABLE_RECORDING -}}
140141

141142
config.hiddenDomain = '{{ $XMPP_RECORDER_DOMAIN }}';
142143

143144
if (!config.hasOwnProperty('recordingService')) config.recordingService = {};
144145

145-
// Whether to enable file recording or not
146-
config.recordingService.enabled = {{ $ENABLE_RECORDING }};
146+
// Whether to enable file recording or not using the "service" defined by the finalizer in Jibri
147+
config.recordingService.enabled = {{ $ENABLE_SERVICE_RECORDING }};
147148

148149
// Whether to enable live streaming or not.
149150
config.liveStreamingEnabled = {{ $ENABLE_LIVESTREAMING }};

0 commit comments

Comments
 (0)