From 7b87c7c3051c0226676760fc46daeb3161e1f9b9 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 17 Mar 2021 11:38:56 -0700 Subject: [PATCH] Disable xmpp websocket in jitsi meet config We unforked our jitsi web container and discovered that etherpad doc embedding was broken. In the process of debugging this the jitsi meet services on meetpad were restart which pulled in newer configs which expect ENABLE_XMPP_WEBSOCKET to be enabled by default. Unfortunately this wasn't quite working for us. Explicitly disabling this seems to make audio and video calling work again. But doc sharing isn't even attempted now. Let's get this fix in as audio and video are important then we'll keep debugging the etherpad doc sharing problem. https://github.com/jitsi/docker-jitsi-meet/issues/902 has details from others that hit this problem. Note that part of the issue here seems to be that nginx is using the default configs in the container found at /default and not the configs we bind mount at /config. This at least seems to be why the proxying for etherpad documents is broken. Change-Id: I03fa9d331e6825b3b953a3573c0dd43c7be478a4 --- .../files/jitsi-meet-docker/meet-docker-compose.yaml | 2 ++ playbooks/roles/jitsi-meet/templates/meet-env.j2 | 3 +++ 2 files changed, 5 insertions(+) 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 f2cdc32358..0273fdd098 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 @@ -23,6 +23,7 @@ services: - LETSENCRYPT_DOMAIN - LETSENCRYPT_EMAIL - PUBLIC_URL + - ENABLE_XMPP_WEBSOCKET - XMPP_DOMAIN - XMPP_AUTH_DOMAIN - XMPP_BOSH_URL_BASE @@ -64,6 +65,7 @@ services: - LDAP_TLS_CACERT_FILE - LDAP_TLS_CACERT_DIR - LDAP_START_TLS + - ENABLE_XMPP_WEBSOCKET - XMPP_DOMAIN - XMPP_AUTH_DOMAIN - XMPP_GUEST_DOMAIN diff --git a/playbooks/roles/jitsi-meet/templates/meet-env.j2 b/playbooks/roles/jitsi-meet/templates/meet-env.j2 index 87338ce276..ca7cdfcb5b 100644 --- a/playbooks/roles/jitsi-meet/templates/meet-env.j2 +++ b/playbooks/roles/jitsi-meet/templates/meet-env.j2 @@ -135,6 +135,9 @@ ETHERPAD_URL_BASE=https://etherpad.opendev.org/p/ # Advanced configuration options (you generally don't need to change these) # +# Needed to make newer jitsi meet happy. We may be able to switch this to 1 +ENABLE_XMPP_WEBSOCKET=0 + # Internal XMPP domain. XMPP_DOMAIN=localhost