Interanet/jitsi-meet-deployment
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: multi tenant setup (#1401)

Browse Source 
* fix: multi tenant setup

refs:
fa5ee32720

https://community.jitsi.org/t/subdomain-not-working-on-docker-conatiner/116967/17

* refactor: lint

* squash: Fixes extra space.

Co-authored-by: Дамян Минков <damencho@jitsi.org>
This commit is contained in:
Debendra Oli
2022-09-12 23:00:24 +05:45
committed by GitHub
parent 47804d0b9e
commit dc5b6a1ef5
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
web/rootfs/defaults/system-config.js
View File

@@ -20,7 +20,11 @@ config.hosts.domain = '{{ $XMPP_DOMAIN }}';
config.focusUserJid = '{{$JICOFO_AUTH_USER}}@{{$XMPP_AUTH_DOMAIN}}'; config.focusUserJid = '{{$JICOFO_AUTH_USER}}@{{$XMPP_AUTH_DOMAIN}}';
{{ if $ENABLE_SUBDOMAINS -}} {{ if $ENABLE_SUBDOMAINS -}}
var subdir = '<!--# echo var="subdir" default="" -->';
var subdomain = "<!--# echo var="subdomain" default="" -->"; var subdomain = "<!--# echo var="subdomain" default="" -->";
if (subdir.startsWith('<!--')) {
subdir = '';
}
if (subdomain) { if (subdomain) {
subdomain = subdomain.substr(0,subdomain.length-1).split('.').join('_').toLowerCase() + '.'; subdomain = subdomain.substr(0,subdomain.length-1).split('.').join('_').toLowerCase() + '.';
} }
@@ -38,14 +42,23 @@ config.hosts.anonymousdomain = '{{ $XMPP_GUEST_DOMAIN }}';
config.hosts.authdomain = '{{ $XMPP_DOMAIN }}'; config.hosts.authdomain = '{{ $XMPP_DOMAIN }}';
{{ end -}} {{ end -}}
{{ if $ENABLE_SUBDOMAINS -}}
config.bosh = '/' + subdir + 'http-bind';
{{ else -}}
config.bosh = '/http-bind'; config.bosh = '/http-bind';
{{ end -}}
{{ if $ENABLE_XMPP_WEBSOCKET -}} {{ if $ENABLE_XMPP_WEBSOCKET -}}
{{ if $ENABLE_SUBDOMAINS -}}
config.websocket = 'wss://{{ $PUBLIC_URL_DOMAIN }}/' + subdir + 'xmpp-websocket';
{{ else -}}
config.websocket = 'wss://{{ $PUBLIC_URL_DOMAIN }}/xmpp-websocket'; config.websocket = 'wss://{{ $PUBLIC_URL_DOMAIN }}/xmpp-websocket';
{{ end -}} {{ end -}}
{{ end -}}
{{ if $CONFIG_EXTERNAL_CONNECT -}} {{ if $CONFIG_EXTERNAL_CONNECT -}}
{{ if $ENABLE_SUBDOMAINS -}} {{ if $ENABLE_SUBDOMAINS -}}
config.externalConnectUrl = '/<!--# echo var="subdir" default="" -->http-pre-bind'; config.externalConnectUrl = '/' + subdir + 'http-pre-bind';
{{ else -}} {{ else -}}
config.externalConnectUrl = '/http-pre-bind'; config.externalConnectUrl = '/http-pre-bind';
{{ end -}} {{ end -}}