| @@ -229,7 +229,7 @@ matrix_jitsi_jvb_stun_servers: ['meet-jit-si-turnrelay.jitsi.net:443'] | |||||
| matrix_jitsi_jvb_brewery_muc: jvbbrewery | matrix_jitsi_jvb_brewery_muc: jvbbrewery | ||||
| matrix_jitsi_jvb_rtp_udp_port: 10000 | matrix_jitsi_jvb_rtp_udp_port: 10000 | ||||
| matrix_jitsi_jvb_rtp_tcp_port: 4443 | matrix_jitsi_jvb_rtp_tcp_port: 4443 | ||||
| matrix_jitsi_jvb_server_ip: '' | |||||
| matrix_jitsi_jvb_server_ip: 'jvb-1' | |||||
| # Custom configuration to be injected into `custom-sip-communicator.properties`, passed to Jitsi JVB. | # Custom configuration to be injected into `custom-sip-communicator.properties`, passed to Jitsi JVB. | ||||
| # This configuration gets appended to the final configuration that Jitsi JVB uses. | # This configuration gets appended to the final configuration that Jitsi JVB uses. | ||||
| @@ -16,7 +16,7 @@ JVB_OCTO_PUBLIC_ADDRESS | |||||
| JVB_OCTO_BIND_PORT | JVB_OCTO_BIND_PORT | ||||
| JVB_OCTO_REGION | JVB_OCTO_REGION | ||||
| JVB_WS_DOMAIN | JVB_WS_DOMAIN | ||||
| JVB_WS_SERVER_ID={{ matrix_jitsi_jvb_public_ip }} | |||||
| JVB_WS_SERVER_ID={{ matrix_jitsi_jvb_server_ip }} | |||||
| PUBLIC_URL={{ matrix_jitsi_web_public_url }} | PUBLIC_URL={{ matrix_jitsi_web_public_url }} | ||||
| SENTRY_DSN="${JVB_SENTRY_DSN:-0}" | SENTRY_DSN="${JVB_SENTRY_DSN:-0}" | ||||
| SENTRY_ENVIRONMENT | SENTRY_ENVIRONMENT | ||||
| @@ -34,7 +34,7 @@ | |||||
| } | } | ||||
| # colibri (JVB) websockets | # colibri (JVB) websockets | ||||
| location ~ ^/colibri-ws/([a-zA-Z0-9-\.]+)/(.*) { | |||||
| location ~ ^/colibri-ws/jvb-1/(.*) { | |||||
| {% if matrix_nginx_proxy_enabled %} | {% if matrix_nginx_proxy_enabled %} | ||||
| resolver 127.0.0.11 valid=5s; | resolver 127.0.0.11 valid=5s; | ||||
| set $backend "matrix-jitsi-jvb:9090"; | set $backend "matrix-jitsi-jvb:9090"; | ||||
| @@ -55,7 +55,7 @@ | |||||
| } | } | ||||
| # colibri (JVB) websockets for additional JVBs | # colibri (JVB) websockets for additional JVBs | ||||
| location ~ ^/colibri-ws/([0-9.]*)/(.*) { | |||||
| location ~ ^/colibri-ws/([a-zA-Z0-9-\.]+)/(.*) { | |||||
| proxy_pass http://$1:9090/colibri-ws/$1/$2$is_args$args; | proxy_pass http://$1:9090/colibri-ws/$1/$2$is_args$args; | ||||
| proxy_set_header Host $host; | proxy_set_header Host $host; | ||||