Interanet/jitsi-meet-deployment
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

jvb: switch to WebSocket based bridge channels

Browse Source
This commit is contained in:
Saúl Ibarra Corretgé
2020-10-02 16:40:04 +02:00
parent 81103362b5
commit ad5625bb09
5 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.yml
View File

@@ -41,7 +41,6 @@ services:
- DROPBOX_REDIRECT_URI - DROPBOX_REDIRECT_URI
- ENABLE_AUDIO_PROCESSING - ENABLE_AUDIO_PROCESSING
- ENABLE_AUTH - ENABLE_AUTH
- ENABLE_BRIDGE_CHANNEL
- ENABLE_CALENDAR - ENABLE_CALENDAR
- ENABLE_FILE_RECORDING_SERVICE - ENABLE_FILE_RECORDING_SERVICE
- ENABLE_FILE_RECORDING_SERVICE_SHARING - ENABLE_FILE_RECORDING_SERVICE_SHARING
@@ -209,11 +208,14 @@ services:
- JVB_TCP_PORT - JVB_TCP_PORT
- JVB_STUN_SERVERS - JVB_STUN_SERVERS
- JVB_ENABLE_APIS - JVB_ENABLE_APIS
- PUBLIC_URL
- TZ - TZ
depends_on: depends_on:
- prosody - prosody
networks: networks:
meet.jitsi: meet.jitsi:
aliases:
- jvb.meet.jitsi
# Custom network so all services can communicate using a FQDN # Custom network so all services can communicate using a FQDN
networks: networks:

2
env.example
View File

@@ -42,7 +42,7 @@ HTTPS_PORT=8443
# System time zone # System time zone
TZ=UTC TZ=UTC
# Public URL for the web service # Public URL for the web service (required)
#PUBLIC_URL=https://meet.example.com #PUBLIC_URL=https://meet.example.com
# IP address of the Docker host # IP address of the Docker host

7
jvb/rootfs/defaults/sip-communicator.properties
View File

@@ -21,3 +21,10 @@ org.jitsi.videobridge.xmpp.user.shard.DISABLE_CERTIFICATE_VERIFICATION=true
org.jitsi.videobridge.ENABLE_STATISTICS=true org.jitsi.videobridge.ENABLE_STATISTICS=true
org.jitsi.videobridge.STATISTICS_TRANSPORT=muc org.jitsi.videobridge.STATISTICS_TRANSPORT=muc
org.jitsi.videobridge.STATISTICS_INTERVAL=5000 org.jitsi.videobridge.STATISTICS_INTERVAL=5000
{{ $WS_DOMAIN := .Env.PUBLIC_URL | default "https://localhost:8443" | trimPrefix "https://" | trimSuffix "/" -}}
org.jitsi.videobridge.rest.COLIBRI_WS_DISABLE=false
org.jitsi.videobridge.rest.jetty.port=9090
org.jitsi.videobridge.rest.COLIBRI_WS_DOMAIN={{ $WS_DOMAIN }}
org.jitsi.videobridge.rest.COLIBRI_WS_TLS=true

9
web/rootfs/defaults/meet.conf
View File

@@ -34,6 +34,15 @@ location ~ ^/(libs|css|static|images|fonts|lang|sounds|connection_optimization|.
alias /usr/share/jitsi-meet/$1/$2; alias /usr/share/jitsi-meet/$1/$2;
} }
# colibri (JVB) websockets
location ~ ^/colibri-ws/default-id/(.*) {
proxy_pass http://jvb.meet.jitsi:9090/colibri-ws/default-id/$1$is_args$args;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
tcp_nodelay on;
}
# BOSH # BOSH
location = /http-bind { location = /http-bind {
proxy_pass {{ .Env.XMPP_BOSH_URL_BASE }}/http-bind; proxy_pass {{ .Env.XMPP_BOSH_URL_BASE }}/http-bind;

5
web/rootfs/defaults/settings-config.js
View File

@@ -1,7 +1,6 @@
{{ $DEPLOYMENTINFO_USERREGION := .Env.DEPLOYMENTINFO_USERREGION | default "" -}} {{ $DEPLOYMENTINFO_USERREGION := .Env.DEPLOYMENTINFO_USERREGION | default "" -}}
{{ $BRIDGE_CHANNEL := .Env.BRIDGE_CHANNEL | default "datachannel" -}} {{ $BRIDGE_CHANNEL := .Env.BRIDGE_CHANNEL | default "websocket" -}}
{{ $ENABLE_AUDIO_PROCESSING := .Env.ENABLE_AUDIO_PROCESSING | default "true" | toBool -}} {{ $ENABLE_AUDIO_PROCESSING := .Env.ENABLE_AUDIO_PROCESSING | default "true" | toBool -}}
{{ $ENABLE_BRIDGE_CHANNEL := .Env.ENABLE_BRIDGE_CHANNEL | default "true" -}}
{{ $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 -}}
@@ -230,7 +229,7 @@ config.enableLipSync = {{ $ENABLE_LIPSYNC }};
config.enableRemb = {{ $ENABLE_REMB }}; config.enableRemb = {{ $ENABLE_REMB }};
config.enableTcc = {{ $ENABLE_TCC }}; config.enableTcc = {{ $ENABLE_TCC }};
config.openBridgeChannel = '{{ $ENABLE_BRIDGE_CHANNEL }}'; config.openBridgeChannel = '{{ $BRIDGE_CHANNEL }}';
// Enable IPv6 support. // Enable IPv6 support.
config.useIPv6 = {{ $ENABLE_IPV6 }}; config.useIPv6 = {{ $ENABLE_IPV6 }};