From 3ef222152efb015e8afab9ab890bceeba6891ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Fri, 16 Oct 2020 15:04:34 +0200 Subject: [PATCH] jvb: add ability to set the WS domain with an env var --- docker-compose.yml | 1 + jvb/rootfs/defaults/sip-communicator.properties | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7fb7646..69931ec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -211,6 +211,7 @@ services: - JVB_TCP_MAPPED_PORT - JVB_STUN_SERVERS - JVB_ENABLE_APIS + - JVB_WS_DOMAIN - JVB_WS_SERVER_ID - PUBLIC_URL - TZ diff --git a/jvb/rootfs/defaults/sip-communicator.properties b/jvb/rootfs/defaults/sip-communicator.properties index c45ebb1..d7afd73 100644 --- a/jvb/rootfs/defaults/sip-communicator.properties +++ b/jvb/rootfs/defaults/sip-communicator.properties @@ -26,8 +26,9 @@ org.jitsi.videobridge.ENABLE_STATISTICS=true org.jitsi.videobridge.STATISTICS_TRANSPORT=muc org.jitsi.videobridge.STATISTICS_INTERVAL=5000 -{{ $WS_DOMAIN := .Env.PUBLIC_URL | default "https://localhost:8443" | trimPrefix "https://" | trimSuffix "/" -}} -{{ $WS_SERVER_ID := .Env.JVB_WS_SERVER_ID | default .Env.LOCAL_ADDRESS }} +{{ $PUBLIC_URL_DOMAIN := .Env.PUBLIC_URL | default "https://localhost:8443" | trimPrefix "https://" | trimSuffix "/" -}} +{{ $WS_DOMAIN := .Env.JVB_WS_DOMAIN | default $PUBLIC_URL_DOMAIN -}} +{{ $WS_SERVER_ID := .Env.JVB_WS_SERVER_ID | default .Env.LOCAL_ADDRESS -}} org.jitsi.videobridge.rest.COLIBRI_WS_DISABLE=false org.jitsi.videobridge.rest.jetty.port=9090