Explorar o código

jibri: add ability to enable Dropbox recording without enabling "service recording"

Also add a new ENABLE_LIVESTREAMING env variable to enable live streaming independently from the recording service.
David Négrier %!s(int64=2) %!d(string=hai) anos
pai
achega
85a38d96a4
Modificáronse 2 ficheiros con 5 adicións e 3 borrados
  1. 1 0
      docker-compose.yml
  2. 4 3
      web/rootfs/defaults/settings-config.js

+ 1 - 0
docker-compose.yml

@@ -69,6 +69,7 @@ services:
             - ENABLE_P2P
             - ENABLE_P2P
             - ENABLE_WELCOME_PAGE
             - ENABLE_WELCOME_PAGE
             - ENABLE_CLOSE_PAGE
             - ENABLE_CLOSE_PAGE
+            - ENABLE_LIVESTREAMING
             - ENABLE_LOCAL_RECORDING_NOTIFY_ALL_PARTICIPANT
             - ENABLE_LOCAL_RECORDING_NOTIFY_ALL_PARTICIPANT
             - ENABLE_LOCAL_RECORDING_SELF_START
             - ENABLE_LOCAL_RECORDING_SELF_START
             - ENABLE_RECORDING
             - ENABLE_RECORDING

+ 4 - 3
web/rootfs/defaults/settings-config.js

@@ -11,6 +11,7 @@
 {{ $ENABLE_WELCOME_PAGE := .Env.ENABLE_WELCOME_PAGE | default "true" | toBool -}}
 {{ $ENABLE_WELCOME_PAGE := .Env.ENABLE_WELCOME_PAGE | default "true" | toBool -}}
 {{ $ENABLE_CLOSE_PAGE := .Env.ENABLE_CLOSE_PAGE | default "false" | toBool -}}
 {{ $ENABLE_CLOSE_PAGE := .Env.ENABLE_CLOSE_PAGE | default "false" | toBool -}}
 {{ $ENABLE_RECORDING := .Env.ENABLE_RECORDING | 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_REMB := .Env.ENABLE_REMB | default "true" | toBool -}}
 {{ $ENABLE_REQUIRE_DISPLAY_NAME := .Env.ENABLE_REQUIRE_DISPLAY_NAME | default "false" | toBool -}}
 {{ $ENABLE_REQUIRE_DISPLAY_NAME := .Env.ENABLE_REQUIRE_DISPLAY_NAME | default "false" | toBool -}}
 {{ $ENABLE_SIMULCAST := .Env.ENABLE_SIMULCAST | default "true" | toBool -}}
 {{ $ENABLE_SIMULCAST := .Env.ENABLE_SIMULCAST | default "true" | toBool -}}
@@ -135,17 +136,17 @@ config.etherpad_base = '{{ $PUBLIC_URL }}/etherpad/p/';
 // Recording.
 // Recording.
 //
 //
 
 
-{{ if $ENABLE_RECORDING -}}
+{{ if or $ENABLE_RECORDING .Env.DROPBOX_APPKEY $ENABLE_LIVESTREAMING  -}}
 
 
 config.hiddenDomain = '{{ $XMPP_RECORDER_DOMAIN }}';
 config.hiddenDomain = '{{ $XMPP_RECORDER_DOMAIN }}';
 
 
 if (!config.hasOwnProperty('recordingService')) config.recordingService = {};
 if (!config.hasOwnProperty('recordingService')) config.recordingService = {};
 
 
 // Whether to enable file recording or not
 // Whether to enable file recording or not
-config.recordingService.enabled = true;
+config.recordingService.enabled = {{ $ENABLE_RECORDING }};
 
 
 // Whether to enable live streaming or not.
 // Whether to enable live streaming or not.
-config.liveStreamingEnabled = true;
+config.liveStreamingEnabled = {{ $ENABLE_LIVESTREAMING }};
 
 
 {{ if .Env.DROPBOX_APPKEY -}}
 {{ if .Env.DROPBOX_APPKEY -}}
 // Enable the dropbox integration.
 // Enable the dropbox integration.