Skip to content

fix: Add DISABLE_HTTPS support for WebSocket URLs in system-config.js #2119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

fix: Add DISABLE_HTTPS support for WebSocket URLs in system-config.js #2119

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3868c40
fix: Add DISABLE_HTTPS support for WebSocket URLs in system-config.js
manohar-cs-03 Jul 9, 2025
278067d
Merge branch 'master' into fix/websocket-https-support
manohar02 Jul 26, 2025
4e2cdbd
Merge branch 'master' into fix/websocket-https-support
manohar02 Aug 8, 2025
7dbe7ca
Fix WebSocket protocol selection based on DISABLE_HTTPS env var
manohar-cs-03 Aug 9, 2025
2a4cec6
removed volume mount for custom web templates
manohar02 Aug 9, 2025
9961d4e
Merge branch 'master' into fix/websocket-https-support
manohar02 Aug 9, 2025
2527536
Merge branch 'master' into fix/websocket-https-support
manohar02 Aug 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions web/rootfs/defaults/system-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
{{ $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 -}}
{{ $DISABLE_HTTPS := .Env.DISABLE_HTTPS | default "0" | toBool -}}
{{ $PUBLIC_URL_DOMAIN := .Env.PUBLIC_URL | default "https://localhost:8443" | trimPrefix "https://" | trimSuffix "/" -}}
{{ $XMPP_AUTH_DOMAIN := .Env.XMPP_AUTH_DOMAIN | default "auth.meet.jitsi" -}}
{{ $XMPP_DOMAIN := .Env.XMPP_DOMAIN | default "meet.jitsi" -}}
Expand Down Expand Up @@ -60,9 +61,9 @@ config.bosh = 'https://{{ $PUBLIC_URL_DOMAIN}}/http-bind';

{{ if $ENABLE_XMPP_WEBSOCKET -}}
{{ if $ENABLE_SUBDOMAINS -}}
config.websocket = 'wss://{{ $PUBLIC_URL_DOMAIN }}/' + subdir + 'xmpp-websocket';
config.websocket = '{{ if $DISABLE_HTTPS }}ws{{ else }}wss{{ end }}://{{ $PUBLIC_URL_DOMAIN }}/' + subdir + 'xmpp-websocket';
{{ else -}}
config.websocket = 'wss://{{ $PUBLIC_URL_DOMAIN }}/xmpp-websocket';
config.websocket = '{{ if $DISABLE_HTTPS }}ws{{ else }}wss{{ end }}://{{ $PUBLIC_URL_DOMAIN }}/xmpp-websocket';
{{ end -}}
{{ end -}}

Expand Down