From 8555fe1c4a7ea434960ec61e7774f1091400d16a Mon Sep 17 00:00:00 2001 From: Aaron van Meerten Date: Tue, 17 Oct 2023 11:52:13 -0500 Subject: [PATCH] web: param to control config.hosts.authDomain (#1627) --- docker-compose.yml | 1 + web/rootfs/defaults/system-config.js | 3 +++ 2 files changed, 4 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 441bff8..3527e86 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -54,6 +54,7 @@ services: - DYNAMIC_BRANDING_URL - ENABLE_AUDIO_PROCESSING - ENABLE_AUTH + - ENABLE_AUTH_DOMAIN - ENABLE_BREAKOUT_ROOMS - ENABLE_CALENDAR - ENABLE_COLIBRI_WEBSOCKET diff --git a/web/rootfs/defaults/system-config.js b/web/rootfs/defaults/system-config.js index f79f56b..2d6f8d0 100644 --- a/web/rootfs/defaults/system-config.js +++ b/web/rootfs/defaults/system-config.js @@ -1,5 +1,6 @@ {{ $CONFIG_EXTERNAL_CONNECT := .Env.CONFIG_EXTERNAL_CONNECT | default "false" | toBool -}} {{ $ENABLE_AUTH := .Env.ENABLE_AUTH | default "false" | toBool -}} +{{ $ENABLE_AUTH_DOMAIN := .Env.ENABLE_AUTH_DOMAIN | default "true" | toBool -}} {{ $ENABLE_GUESTS := .Env.ENABLE_GUESTS | default "false" | toBool -}} {{ $ENABLE_SUBDOMAINS := .Env.ENABLE_SUBDOMAINS | default "true" | toBool -}} {{ $ENABLE_XMPP_WEBSOCKET := .Env.ENABLE_XMPP_WEBSOCKET | default "1" | toBool -}} @@ -37,9 +38,11 @@ config.hosts.muc = '{{ $XMPP_MUC_DOMAIN }}'; // When using authentication, domain for guest users. config.hosts.anonymousdomain = '{{ $XMPP_GUEST_DOMAIN }}'; {{ end -}} +{{ if $ENABLE_AUTH_DOMAIN -}} // Domain for authenticated users. Defaults to . config.hosts.authdomain = '{{ $XMPP_DOMAIN }}'; {{ end -}} +{{ end -}} config.bosh = '/http-bind';