web,prosody: add breakout rooms support
Co-authored-by: Saúl Ibarra Corretgé <saghul@jitsi.org>
This commit is contained in:
committed by
Saúl Ibarra Corretgé
parent
320829601c
commit
6f56e5b7a2
@@ -43,6 +43,7 @@ services:
|
|||||||
- DYNAMIC_BRANDING_URL
|
- DYNAMIC_BRANDING_URL
|
||||||
- ENABLE_AUDIO_PROCESSING
|
- ENABLE_AUDIO_PROCESSING
|
||||||
- ENABLE_AUTH
|
- ENABLE_AUTH
|
||||||
|
- ENABLE_BREAKOUT_ROOMS
|
||||||
- ENABLE_CALENDAR
|
- ENABLE_CALENDAR
|
||||||
- ENABLE_COLIBRI_WEBSOCKET
|
- ENABLE_COLIBRI_WEBSOCKET
|
||||||
- ENABLE_FILE_RECORDING_SERVICE
|
- ENABLE_FILE_RECORDING_SERVICE
|
||||||
@@ -140,6 +141,7 @@ services:
|
|||||||
- DISABLE_POLLS
|
- DISABLE_POLLS
|
||||||
- ENABLE_AUTH
|
- ENABLE_AUTH
|
||||||
- ENABLE_AV_MODERATION
|
- ENABLE_AV_MODERATION
|
||||||
|
- ENABLE_BREAKOUT_ROOMS
|
||||||
- ENABLE_GUESTS
|
- ENABLE_GUESTS
|
||||||
- ENABLE_LOBBY
|
- ENABLE_LOBBY
|
||||||
- ENABLE_XMPP_WEBSOCKET
|
- ENABLE_XMPP_WEBSOCKET
|
||||||
@@ -226,8 +228,8 @@ services:
|
|||||||
- JICOFO_CONF_SINGLE_PARTICIPANT_TIMEOUT
|
- JICOFO_CONF_SINGLE_PARTICIPANT_TIMEOUT
|
||||||
- JICOFO_ENABLE_HEALTH_CHECKS
|
- JICOFO_ENABLE_HEALTH_CHECKS
|
||||||
- JICOFO_SHORT_ID
|
- JICOFO_SHORT_ID
|
||||||
- JICOFO_RESERVATION_ENABLED
|
- JICOFO_RESERVATION_ENABLED
|
||||||
- JICOFO_RESERVATION_REST_BASE_URL
|
- JICOFO_RESERVATION_REST_BASE_URL
|
||||||
- JIBRI_BREWERY_MUC
|
- JIBRI_BREWERY_MUC
|
||||||
- JIBRI_REQUEST_RETRIES
|
- JIBRI_REQUEST_RETRIES
|
||||||
- JIBRI_PENDING_TIMEOUT
|
- JIBRI_PENDING_TIMEOUT
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
{{ $JWT_TOKEN_AUTH_MODULE := .Env.JWT_TOKEN_AUTH_MODULE | default "token_verification" }}
|
{{ $JWT_TOKEN_AUTH_MODULE := .Env.JWT_TOKEN_AUTH_MODULE | default "token_verification" }}
|
||||||
{{ $ENABLE_LOBBY := .Env.ENABLE_LOBBY | default "true" | toBool }}
|
{{ $ENABLE_LOBBY := .Env.ENABLE_LOBBY | default "true" | toBool }}
|
||||||
{{ $ENABLE_AV_MODERATION := .Env.ENABLE_AV_MODERATION | default "true" | toBool }}
|
{{ $ENABLE_AV_MODERATION := .Env.ENABLE_AV_MODERATION | default "true" | toBool }}
|
||||||
|
{{ $ENABLE_BREAKOUT_ROOMS := .Env.ENABLE_BREAKOUT_ROOMS | default "true" | toBool }}
|
||||||
{{ $ENABLE_XMPP_WEBSOCKET := .Env.ENABLE_XMPP_WEBSOCKET | default "1" | toBool }}
|
{{ $ENABLE_XMPP_WEBSOCKET := .Env.ENABLE_XMPP_WEBSOCKET | default "1" | toBool }}
|
||||||
{{ $PUBLIC_URL := .Env.PUBLIC_URL | default "https://localhost:8443" -}}
|
{{ $PUBLIC_URL := .Env.PUBLIC_URL | default "https://localhost:8443" -}}
|
||||||
{{ $TURN_PORT := .Env.TURN_PORT | default "443" }}
|
{{ $TURN_PORT := .Env.TURN_PORT | default "443" }}
|
||||||
@@ -115,6 +116,9 @@ VirtualHost "{{ .Env.XMPP_DOMAIN }}"
|
|||||||
{{ if $ENABLE_LOBBY }}
|
{{ if $ENABLE_LOBBY }}
|
||||||
"muc_lobby_rooms";
|
"muc_lobby_rooms";
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
{{ if $ENABLE_BREAKOUT_ROOMS }}
|
||||||
|
"muc_breakout_rooms";
|
||||||
|
{{ end }}
|
||||||
{{ if $ENABLE_AV_MODERATION }}
|
{{ if $ENABLE_AV_MODERATION }}
|
||||||
"av_moderation";
|
"av_moderation";
|
||||||
{{ end }}
|
{{ end }}
|
||||||
@@ -126,14 +130,19 @@ VirtualHost "{{ .Env.XMPP_DOMAIN }}"
|
|||||||
{{end}}
|
{{end}}
|
||||||
}
|
}
|
||||||
|
|
||||||
{{ if $ENABLE_LOBBY }}
|
|
||||||
main_muc = "{{ .Env.XMPP_MUC_DOMAIN }}"
|
main_muc = "{{ .Env.XMPP_MUC_DOMAIN }}"
|
||||||
|
|
||||||
|
{{ if $ENABLE_LOBBY }}
|
||||||
lobby_muc = "lobby.{{ .Env.XMPP_DOMAIN }}"
|
lobby_muc = "lobby.{{ .Env.XMPP_DOMAIN }}"
|
||||||
{{ if .Env.XMPP_RECORDER_DOMAIN }}
|
{{ if .Env.XMPP_RECORDER_DOMAIN }}
|
||||||
muc_lobby_whitelist = { "{{ .Env.XMPP_RECORDER_DOMAIN }}" }
|
muc_lobby_whitelist = { "{{ .Env.XMPP_RECORDER_DOMAIN }}" }
|
||||||
{{ end }}
|
{{ end }}
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
|
{{ if $ENABLE_BREAKOUT_ROOMS }}
|
||||||
|
breakout_rooms_muc = "breakout.{{ .Env.XMPP_DOMAIN }}"
|
||||||
|
{{ end }}
|
||||||
|
|
||||||
speakerstats_component = "speakerstats.{{ .Env.XMPP_DOMAIN }}"
|
speakerstats_component = "speakerstats.{{ .Env.XMPP_DOMAIN }}"
|
||||||
conference_duration_component = "conferenceduration.{{ .Env.XMPP_DOMAIN }}"
|
conference_duration_component = "conferenceduration.{{ .Env.XMPP_DOMAIN }}"
|
||||||
|
|
||||||
@@ -219,3 +228,11 @@ Component "lobby.{{ .Env.XMPP_DOMAIN }}" "muc"
|
|||||||
muc_room_locking = false
|
muc_room_locking = false
|
||||||
muc_room_default_public_jids = true
|
muc_room_default_public_jids = true
|
||||||
{{ end }}
|
{{ end }}
|
||||||
|
|
||||||
|
{{ if $ENABLE_BREAKOUT_ROOMS }}
|
||||||
|
Component "breakout.{{ .Env.XMPP_DOMAIN }}" "muc"
|
||||||
|
storage = "memory"
|
||||||
|
restrict_room_creation = true
|
||||||
|
muc_room_locking = false
|
||||||
|
muc_room_default_public_jids = true
|
||||||
|
{{ end }}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
{{ $DEPLOYMENTINFO_USERREGION := .Env.DEPLOYMENTINFO_USERREGION | default "" -}}
|
{{ $DEPLOYMENTINFO_USERREGION := .Env.DEPLOYMENTINFO_USERREGION | default "" -}}
|
||||||
{{ $ENABLE_AUDIO_PROCESSING := .Env.ENABLE_AUDIO_PROCESSING | default "true" | toBool -}}
|
{{ $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_CALENDAR := .Env.ENABLE_CALENDAR | default "false" | toBool -}}
|
||||||
{{ $ENABLE_FILE_RECORDING_SERVICE := .Env.ENABLE_FILE_RECORDING_SERVICE | 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_SERVICE_SHARING := .Env.ENABLE_FILE_RECORDING_SERVICE_SHARING | default "false" | toBool -}}
|
||||||
@@ -59,7 +60,7 @@ config.startWithVideoMuted = {{ $START_WITH_VIDEO_MUTED }};
|
|||||||
{{ if .Env.START_BITRATE -}}
|
{{ if .Env.START_BITRATE -}}
|
||||||
config.startBitrate = '{{ .Env.START_BITRATE }}';
|
config.startBitrate = '{{ .Env.START_BITRATE }}';
|
||||||
{{ end -}}
|
{{ end -}}
|
||||||
|
|
||||||
// ScreenShare Configuration.
|
// ScreenShare Configuration.
|
||||||
//
|
//
|
||||||
config.desktopSharingFrameRate = { min: {{ $DESKTOP_SHARING_FRAMERATE_MIN }}, max: {{ $DESKTOP_SHARING_FRAMERATE_MAX }} };
|
config.desktopSharingFrameRate = { min: {{ $DESKTOP_SHARING_FRAMERATE_MIN }}, max: {{ $DESKTOP_SHARING_FRAMERATE_MAX }} };
|
||||||
@@ -87,6 +88,12 @@ if (!config.hasOwnProperty('p2p')) config.p2p = {};
|
|||||||
config.p2p.enabled = {{ $ENABLE_P2P }};
|
config.p2p.enabled = {{ $ENABLE_P2P }};
|
||||||
|
|
||||||
|
|
||||||
|
// Breakout Rooms
|
||||||
|
//
|
||||||
|
|
||||||
|
config.hideAddRoomButton = {{ $ENABLE_BREAKOUT_ROOMS | not }};
|
||||||
|
|
||||||
|
|
||||||
// Etherpad
|
// Etherpad
|
||||||
//
|
//
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user