From c2c646054baceff4bab0cc3287138cf9a19397c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Wed, 9 Dec 2020 11:39:10 +0100 Subject: [PATCH] prosody: fix cross-domain WS default value Somehow the ENV directive doesn't work in all cases (?) and I got a template error when upgrading. --- prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua index c339f61..86c5202 100644 --- a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua +++ b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua @@ -31,11 +31,12 @@ consider_bosh_secure = true; -- Deprecated in 0.12 -- https://github.com/bjc/prosody/commit/26542811eafd9c708a130272d7b7de77b92712de {{ $XMPP_CROSS_DOMAINS := $PUBLIC_URL }} -{{ if eq .Env.XMPP_CROSS_DOMAIN "true"}} +{{ $XMPP_CROSS_DOMAIN := .Env.XMPP_CROSS_DOMAIN | default "" }} +{{ if eq $XMPP_CROSS_DOMAIN "true"}} cross_domain_websocket = true cross_domain_bosh = true {{ else }} -{{ if and .Env.XMPP_CROSS_DOMAIN (not (eq .Env.XMPP_CROSS_DOMAIN "false" )) }} +{{ if not (eq $XMPP_CROSS_DOMAIN "false") }} {{ $XMPP_CROSS_DOMAINS = list $PUBLIC_URL .Env.XMPP_CROSS_DOMAIN | join "," }} {{ end }} cross_domain_websocket = { "{{ join "\",\"" (splitList "," $XMPP_CROSS_DOMAINS) }}" }