From 080ff3954f0c2d029fa19beb0f1dcc7794370c2a Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 2 Sep 2022 21:32:39 +0000 Subject: [PATCH] Pass PUBLIC_URL to jitsi-meet jvb containers For some reason, the JVB servers now seem to tell clients to connect to 8443/tcp on localhost rather than the actual server. It seems it wants to build the URL based on the PUBLIC_URL envvar, but we previously did not pass that through to the JVB containers. Add it to their configuration so they'll have it available. Change-Id: I10c761105490a72c4eb9ac0b08a304b7d5d1e18c --- .../jitsi-meet/files/jitsi-meet-docker/jvb-docker-compose.yaml | 1 + .../jitsi-meet/files/jitsi-meet-docker/meet-docker-compose.yaml | 1 + playbooks/roles/jitsi-meet/templates/jvb-env.j2 | 1 + 3 files changed, 3 insertions(+) diff --git a/playbooks/roles/jitsi-meet/files/jitsi-meet-docker/jvb-docker-compose.yaml b/playbooks/roles/jitsi-meet/files/jitsi-meet-docker/jvb-docker-compose.yaml index 94bc0b4075..1c45e25372 100644 --- a/playbooks/roles/jitsi-meet/files/jitsi-meet-docker/jvb-docker-compose.yaml +++ b/playbooks/roles/jitsi-meet/files/jitsi-meet-docker/jvb-docker-compose.yaml @@ -13,6 +13,7 @@ services: - ${CONFIG}/jvb:/config environment: - DOCKER_HOST_ADDRESS + - PUBLIC_URL - XMPP_AUTH_DOMAIN - XMPP_INTERNAL_MUC_DOMAIN - XMPP_SERVER diff --git a/playbooks/roles/jitsi-meet/files/jitsi-meet-docker/meet-docker-compose.yaml b/playbooks/roles/jitsi-meet/files/jitsi-meet-docker/meet-docker-compose.yaml index ad2f4e2088..b11bfe45ed 100644 --- a/playbooks/roles/jitsi-meet/files/jitsi-meet-docker/meet-docker-compose.yaml +++ b/playbooks/roles/jitsi-meet/files/jitsi-meet-docker/meet-docker-compose.yaml @@ -138,6 +138,7 @@ services: - ${CONFIG}/jvb:/config environment: - DOCKER_HOST_ADDRESS + - PUBLIC_URL - XMPP_AUTH_DOMAIN - XMPP_INTERNAL_MUC_DOMAIN - XMPP_SERVER diff --git a/playbooks/roles/jitsi-meet/templates/jvb-env.j2 b/playbooks/roles/jitsi-meet/templates/jvb-env.j2 index 94b30a7f7d..2011c6bde2 100644 --- a/playbooks/roles/jitsi-meet/templates/jvb-env.j2 +++ b/playbooks/roles/jitsi-meet/templates/jvb-env.j2 @@ -4,6 +4,7 @@ # Customized for OpenDev, all overrides go here (and remember to comment out # any defaults from the example): CONFIG=/var/jitsi-meet +PUBLIC_URL=https://meetpad.opendev.org XMPP_SERVER={{ meetpad_jvb_xmpp_server }} XMPP_AUTH_DOMAIN=auth.localhost XMPP_INTERNAL_MUC_DOMAIN=internal-muc.localhost