From 0d1112638d8de9ea3edaf155160c999bfe0e8b76 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Wed, 12 Mar 2025 08:05:42 +0200 Subject: [PATCH] Update LiveKit JWT service path prefix (`/lk-jwt-service` -> `/livekit-jwt-service`) --- docs/configuring-playbook-element-call.md | 4 ++-- docs/configuring-playbook-jwt-service.md | 4 ++-- group_vars/matrix_servers | 2 +- roles/custom/matrix-livekit-jwt-service/defaults/main.yml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/configuring-playbook-element-call.md b/docs/configuring-playbook-element-call.md index 9a30ae350..930dd829e 100644 --- a/docs/configuring-playbook-element-call.md +++ b/docs/configuring-playbook-element-call.md @@ -46,9 +46,9 @@ After configuring the playbook and potentially [adjusting your DNS records](#adj ## Usage -Once installed, Element Call integrates seamlessly with Matrix clients like [Element Web](configuring-playbook-client-element-web.md). When the Element Call service is installed, the `/.well-known/matrix/client` file is also updated. A new `org.matrix.msc4143.rtc_foci` section is added to point to your LiveKit JWT service URL (e.g., `https://matrix.example.com/lk-jwt-service`). +Once installed, Element Call integrates seamlessly with Matrix clients like [Element Web](configuring-playbook-client-element-web.md). When the Element Call service is installed, the `/.well-known/matrix/client` file is also updated. A new `org.matrix.msc4143.rtc_foci` section is added to point to your LiveKit JWT service URL (e.g., `https://matrix.example.com/livekit-jwt-service`). -Additionally, the `/.well-known/element/element.json` file is created to help Element clients discover the Element Call URL (e.g., `https://call.example.com`). +Additionally, the `/.well-known/element/element.json` file is created to help Element clients discover the Element Call URL (e.g., `https://call.element.example.com`). ## Required Firewall and Port Forwarding Rules diff --git a/docs/configuring-playbook-jwt-service.md b/docs/configuring-playbook-jwt-service.md index ec1eb9dca..22fe30e8f 100644 --- a/docs/configuring-playbook-jwt-service.md +++ b/docs/configuring-playbook-jwt-service.md @@ -18,7 +18,7 @@ See the project's [documentation](https://github.com/element-hq/lk-jwt-service/) By default, JWT Service is configured to be served: - on the Matrix domain (`matrix.example.com`), configurable via `matrix_livekit_jwt_service_hostname` -- under a `/lk-jwt-service` path prefix, configurable via `matrix_livekit_jwt_service_path_prefix` +- under a `/livekit-jwt-service` path prefix, configurable via `matrix_livekit_jwt_service_path_prefix` This makes it easy to set it up, **without** having to adjust your DNS records manually. @@ -40,7 +40,7 @@ After configuring the playbook and potentially [adjusting your DNS records](#adj ## Usage -Once installed, a new `org.matrix.msc4143.rtc_foci` section is added to the Element Web client to point to your JWT service URL (e.g., `https://matrix.example.com/lk-jwt-service`). +Once installed, a new `org.matrix.msc4143.rtc_foci` section is added to the Element Web client to point to your JWT service URL (e.g., `https://matrix.example.com/livekit-jwt-service`). ## Additional Information diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 86e327256..5132f0311 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -6330,7 +6330,7 @@ matrix_livekit_jwt_service_enabled: "{{ matrix_element_call_enabled and livekit_ matrix_livekit_jwt_service_scheme: "{{ 'https' if matrix_playbook_ssl_enabled else 'http' }}" matrix_livekit_jwt_service_hostname: "{{ matrix_server_fqn_matrix }}" -matrix_livekit_jwt_service_path_prefix: "/lk-jwt-service" +matrix_livekit_jwt_service_path_prefix: "/livekit-jwt-service" matrix_livekit_jwt_service_container_image_self_build: "{{ matrix_architecture not in ['amd64', 'arm64'] }}" diff --git a/roles/custom/matrix-livekit-jwt-service/defaults/main.yml b/roles/custom/matrix-livekit-jwt-service/defaults/main.yml index 8277b75cb..3c609195d 100644 --- a/roles/custom/matrix-livekit-jwt-service/defaults/main.yml +++ b/roles/custom/matrix-livekit-jwt-service/defaults/main.yml @@ -12,7 +12,7 @@ matrix_livekit_jwt_service_enabled: false matrix_livekit_jwt_service_scheme: https matrix_livekit_jwt_service_hostname: "" -matrix_livekit_jwt_service_path_prefix: "/lk-jwt-service" +matrix_livekit_jwt_service_path_prefix: "/livekit-jwt-service" matrix_livekit_jwt_service_base_path: "{{ matrix_base_data_path }}/livekit-jwt-service" @@ -42,7 +42,7 @@ matrix_livekit_jwt_service_container_image_force_pull: "{{ matrix_livekit_jwt_se matrix_livekit_jwt_service_container_labels_traefik_enabled: true matrix_livekit_jwt_service_container_labels_traefik_docker_network: "{{ matrix_livekit_jwt_service_container_network }}" matrix_livekit_jwt_service_container_labels_traefik_hostname: "{{ matrix_livekit_jwt_service_hostname }}" -# The path prefix must either be `/` or not end with a slash (e.g. `/lk-jwt-service`). +# The path prefix must either be `/` or not end with a slash (e.g. `/livekit-jwt-service`). matrix_livekit_jwt_service_container_labels_traefik_path_prefix: "{{ matrix_livekit_jwt_service_path_prefix }}" matrix_livekit_jwt_service_container_labels_traefik_rule: "Host(`{{ matrix_livekit_jwt_service_container_labels_traefik_hostname }}`){% if matrix_livekit_jwt_service_container_labels_traefik_path_prefix != '/' %} && PathPrefix(`{{ matrix_livekit_jwt_service_container_labels_traefik_path_prefix }}`){% endif %}" matrix_livekit_jwt_service_container_labels_traefik_priority: 0