Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adapting Jibri configuration for new Jitsi web behaviour #1372

Merged
merged 1 commit into from
Aug 18, 2022
Merged

Adapting Jibri configuration for new Jitsi web behaviour #1372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ services:
- ENABLE_P2P
- ENABLE_WELCOME_PAGE
- ENABLE_CLOSE_PAGE
- ENABLE_LIVESTREAMING
- ENABLE_LOCAL_RECORDING_NOTIFY_ALL_PARTICIPANT
- ENABLE_LOCAL_RECORDING_SELF_START
- ENABLE_RECORDING
Expand Down
7 changes: 4 additions & 3 deletions web/rootfs/defaults/settings-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
{{ $ENABLE_WELCOME_PAGE := .Env.ENABLE_WELCOME_PAGE | default "true" | toBool -}}
{{ $ENABLE_CLOSE_PAGE := .Env.ENABLE_CLOSE_PAGE | default "false" | toBool -}}
{{ $ENABLE_RECORDING := .Env.ENABLE_RECORDING | default "false" | toBool -}}
{{ $ENABLE_LIVESTREAMING := .Env.ENABLE_LIVESTREAMING | default "false" | toBool -}}
{{ $ENABLE_REMB := .Env.ENABLE_REMB | default "true" | toBool -}}
{{ $ENABLE_REQUIRE_DISPLAY_NAME := .Env.ENABLE_REQUIRE_DISPLAY_NAME | default "false" | toBool -}}
{{ $ENABLE_SIMULCAST := .Env.ENABLE_SIMULCAST | default "true" | toBool -}}
Expand Down Expand Up @@ -135,17 +136,17 @@ config.etherpad_base = '{{ $PUBLIC_URL }}/etherpad/p/';
// Recording.
//

{{ if $ENABLE_RECORDING -}}
{{ if or $ENABLE_RECORDING .Env.DROPBOX_APPKEY $ENABLE_LIVESTREAMING -}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should check for the Dropbox app key here. ENABLE_RECORDING should also be set, if not we should ignore that.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @saghul ,

Thanks for the feedback!

What I'm looking for is a way to enable Dropbox but disabling the recordingService (because in the new version, both services can be enabled at the same time).

So what I want in the end is to have a file like this:

// Whether to enable file recording or not
config.recordingService.enabled = false;
config.liveStreamingEnabled = true;

// Enable the dropbox integration.
if (!config.hasOwnProperty('dropbox')) config.dropbox = {};
config.dropbox.appKey = 'my_dropbox_key';

To do this, I though I would use those environment variables:

ENABLE_RECORDING=false
DROPBOX_APPKEY=my_dropbox_key

It slightly modifies the semantics of ENABLE_RECORDING because now, ENABLE_RECORDING refers only to the recordingService (but this is coherent with the change in the Jibri configuration).

If you want ENABLE_RECORDING to be a generic environment variable spawning both the "recording service" and dropbox, maybe I can find another environment variable that specifically disables the recording service?

Something like a new "DISABLE_SERVICE_RECORDING"?

{{ if $ENABLE_RECORDING -}}

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

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

// Whether to enable file recording or not
config.recordingService.enabled = {{ not $DISABLE_SERVICE_RECORDING }};

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

{{ if .Env.DROPBOX_APPKEY -}}
// Enable the dropbox integration.
if (!config.hasOwnProperty('dropbox')) config.dropbox = {};
config.dropbox.appKey = '{{ .Env.DROPBOX_APPKEY }}';
{{ if .Env.DROPBOX_REDIRECT_URI -}}
// A URL to redirect the user to, after authenticating
// by default uses:
// 'https://jitsi-meet.example.com/static/oauth.html'
config.dropbox.redirectURI = '{{ .Env.DROPBOX_REDIRECT_URI }}';
{{ end -}}
{{ end -}}

In this case, to achieve a "dropbox-only" recording, one would have to use:

ENABLE_RECORDING=true
DISABLE_SERVICE_RECORDING=true
DROPBOX_APPKEY=my_dropbox_key

What do you think works best?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let me double check, I think you're right.


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

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

// Whether to enable file recording or not
config.recordingService.enabled = true;
config.recordingService.enabled = {{ $ENABLE_RECORDING }};

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

{{ if .Env.DROPBOX_APPKEY -}}
// Enable the dropbox integration.
Expand Down