Skip to content

use element livekit by default #306

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

Merged
merged 1 commit into from
Mar 24, 2025
Merged

use element livekit by default #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions charts/matrix-stack/templates/well-known/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ k8s.element.io/target-instance: {{ $root.Release.Name }}-haproxy
{{- $_ := set $config "org.matrix.msc2965.authentication" $msc2965 -}}
{{- end -}}
{{- end -}}
{{- $_ := set $config "org.matrix.msc4143.rtc_foci" (list (dict "type" "livekit" "livekit_service_url" "https://livekit-jwt.call.element.io")) -}}
{{- $additional := .additional.client | fromJson -}}
{{- tpl (toPrettyJson (merge $config $additional)) $root -}}
{{- end -}}
Expand Down
1 change: 1 addition & 0 deletions newsfragments/306.added.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Configure well-known to use Element LiveKit by default.
6 changes: 5 additions & 1 deletion tests/integration/test_well_known_delegation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ async def test_well_known_files_can_be_accessed(
if value_file_has("synapse.enabled", True):
assert "m.homeserver" in json_content
else:
assert json_content == {}
assert json_content == {
"org.matrix.msc4143.rtc_foci": [
{"type": "livekit", "livekit_service_url": "https://livekit-jwt.call.element.io"}
]
}

json_content = await aiottp_get_json(f"https://{generated_data.server_name}/.well-known/matrix/server", ssl_context)
if value_file_has("synapse.enabled", True):
Expand Down
5 changes: 5 additions & 0 deletions tests/manifests/test_well_known_delegation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ async def assert_well_known_files(
expected_server = {}
if expected_client is None:
expected_client = {}
expected_client = expected_client | {
"org.matrix.msc4143.rtc_foci": [
{"type": "livekit", "livekit_service_url": "https://livekit-jwt.call.element.io"}
]
}
client_config = {"testclientkey": {"testsubket": "testvalue"}}
server_config = {"testserverkey": {"testsubket": "testvalue"}}
element_config = {"testelementkey": {"testsubket": "testvalue"}}
Expand Down
Loading