From 465816b4ebf2babf1b9e6daf007301c1fd17552e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Thu, 29 Oct 2020 21:57:54 +0100 Subject: [PATCH] web,prosody: turn on XMPP WebSocket by default --- env.example | 3 --- prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua | 2 +- web/rootfs/defaults/meet.conf | 2 +- web/rootfs/defaults/system-config.js | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/env.example b/env.example index d5b979b..b01bd04 100644 --- a/env.example +++ b/env.example @@ -329,9 +329,6 @@ JIBRI_LOGS_DIR=/config/logs # Necessary for Let's Encrypt, relies on standard HTTPS port (443) #ENABLE_HTTP_REDIRECT=1 -# Enabled XMPP traffic over WebSocket (PUBLIC_URL must be defined!) -#ENABLE_XMPP_WEBSOCKET=1 - # Container restart policy # Defaults to unless-stopped RESTART_POLICY=unless-stopped diff --git a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua index 4dda253..252eb27 100644 --- a/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua +++ b/prosody/rootfs/defaults/conf.d/jitsi-meet.cfg.lua @@ -15,7 +15,7 @@ http_default_host = "{{ .Env.XMPP_DOMAIN }}" {{ $JWT_TOKEN_AUTH_MODULE := .Env.JWT_TOKEN_AUTH_MODULE | default "token_verification" }} {{ $ENABLE_LOBBY := .Env.ENABLE_LOBBY | default "0" | toBool }} -{{ $ENABLE_XMPP_WEBSOCKET := .Env.ENABLE_XMPP_WEBSOCKET | default "0" | toBool }} +{{ $ENABLE_XMPP_WEBSOCKET := .Env.ENABLE_XMPP_WEBSOCKET | default "1" | toBool }} {{ $PUBLIC_URL := .Env.PUBLIC_URL | default "https://localhost:8443" -}} {{ if and $ENABLE_AUTH (eq $AUTH_TYPE "jwt") .Env.JWT_ACCEPTED_ISSUERS }} diff --git a/web/rootfs/defaults/meet.conf b/web/rootfs/defaults/meet.conf index 8ff0fa9..4b10234 100644 --- a/web/rootfs/defaults/meet.conf +++ b/web/rootfs/defaults/meet.conf @@ -1,4 +1,4 @@ -{{ $ENABLE_XMPP_WEBSOCKET := .Env.ENABLE_XMPP_WEBSOCKET | default "0" | toBool }} +{{ $ENABLE_XMPP_WEBSOCKET := .Env.ENABLE_XMPP_WEBSOCKET | default "1" | toBool }} server_name _; diff --git a/web/rootfs/defaults/system-config.js b/web/rootfs/defaults/system-config.js index a0d16c5..6026442 100644 --- a/web/rootfs/defaults/system-config.js +++ b/web/rootfs/defaults/system-config.js @@ -2,7 +2,7 @@ {{ $ENABLE_AUTH := .Env.ENABLE_AUTH | default "false" | toBool -}} {{ $ENABLE_GUESTS := .Env.ENABLE_GUESTS | default "false" | toBool -}} {{ $ENABLE_SUBDOMAINS := .Env.ENABLE_SUBDOMAINS | default "false" | toBool -}} -{{ $ENABLE_XMPP_WEBSOCKET := .Env.ENABLE_XMPP_WEBSOCKET | default "false" | toBool -}} +{{ $ENABLE_XMPP_WEBSOCKET := .Env.ENABLE_XMPP_WEBSOCKET | default "1" | toBool -}} {{ $JICOFO_AUTH_USER := .Env.JICOFO_AUTH_USER | default "focus" }} {{ $PUBLIC_URL_DOMAIN := .Env.PUBLIC_URL | default "https://localhost:8443" | trimPrefix "https://" | trimSuffix "/" -}} {{ $XMPP_AUTH_DOMAIN := .Env.XMPP_AUTH_DOMAIN -}}