Skip to content
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.

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

fix(web) 🐛 wrong quote in default config #1761

Merged
merged 1 commit into from
Mar 19, 2024

Conversation

HannesOberreiter
Copy link
Contributor

Quotes in the config for subdomain were wrong.

@HannesOberreiter HannesOberreiter changed the title web: fix: 🐛 wrong quote in default config fix(web) 🐛 wrong quote in default config Mar 19, 2024
@@ -22,7 +22,7 @@ config.focusUserJid = 'focus@{{$XMPP_AUTH_DOMAIN}}';

{{ if $ENABLE_SUBDOMAINS -}}
var subdir = '<!--# echo var="subdir" default="" -->';
var subdomain = "<!--# echo var="subdomain" default="" -->";
var subdomain = '<!--# echo var="subdomain" default="" -->';
Copy link
Member

@aaronkvanmeerten aaronkvanmeerten Mar 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm curious what impact you saw from this?

The nginx container shoudl be replacing the full contents from <!-- all the way to --> using SSI directives before any javascript is parsed by the browser. So there should not be any point at which the quotes conflict.

Copy link
Contributor Author

@HannesOberreiter HannesOberreiter Mar 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently setting up a dev environment to make some changes on the jitsi meet server code and was struggling to load the config and though maybe its this, but just found out it was something different. So it is no bug only style and it now follows the jitsi-meet repo:

https://github.com/jitsi/jitsi-meet/blob/master/config.js

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Excellent, I'm all for consistency but I just wanted to ensure I understood the impact of the existing code.

@aaronkvanmeerten aaronkvanmeerten merged commit ca1d670 into jitsi:master Mar 19, 2024
1 check passed
saghul added a commit that referenced this pull request Mar 22, 2024
* a5ebb99 jibri: flag to support prometheus-style metrics (#1768)
* 80fc10e feat(prosody): Cleans up gc settings.
* 69bba17 feat(prosody): Adjusts lua to use generational GC for brewery.cfg.lua.
* 2798426 feat(prosody): Adjusts lua to use generational GC.
* 28d2b32 feat(prosody): Make sure muc tumbstones is disabled.
* d5df19d jigasi: autoscaler sidecar support (#1738)
* 0953ca0 jigasi: skip SIP configuration when configured as a transcriber
* ca1d670 fix: 🐛 wrong quote in default config (#1761)
* 360361e jibri: move xmpp config for easier override (#1748)
* 452f5ba misc: working on unstable
benbz added a commit to matrix-org/docker-jitsi-meet that referenced this pull request Mar 27, 2024
release

* a5ebb99 jibri: flag to support prometheus-style metrics (jitsi#1768)
* 80fc10e feat(prosody): Cleans up gc settings.
* 69bba17 feat(prosody): Adjusts lua to use generational GC for brewery.cfg.lua.
* 2798426 feat(prosody): Adjusts lua to use generational GC.
* 28d2b32 feat(prosody): Make sure muc tumbstones is disabled.
* d5df19d jigasi: autoscaler sidecar support (jitsi#1738)
* 0953ca0 jigasi: skip SIP configuration when configured as a transcriber
* ca1d670 fix: 🐛 wrong quote in default config (jitsi#1761)
* 360361e jibri: move xmpp config for easier override (jitsi#1748)
* 452f5ba misc: working on unstable
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants