From 5961841e52841015bb1ce065bd3bcb5c669cca36 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Wed, 12 Mar 2025 08:59:05 +0200 Subject: [PATCH] Make matrix-livekit-jwt-service role not reference foreign variables (except the matrix-base ones) --- roles/custom/matrix-livekit-jwt-service/defaults/main.yml | 4 ++-- roles/custom/matrix-livekit-jwt-service/templates/labels.j2 | 2 +- roles/custom/matrix-livekit-server/tasks/install.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/custom/matrix-livekit-jwt-service/defaults/main.yml b/roles/custom/matrix-livekit-jwt-service/defaults/main.yml index 3c609195d..cdba27bf1 100644 --- a/roles/custom/matrix-livekit-jwt-service/defaults/main.yml +++ b/roles/custom/matrix-livekit-jwt-service/defaults/main.yml @@ -56,11 +56,11 @@ matrix_livekit_jwt_service_container_labels_traefik_additional_response_headers: matrix_livekit_jwt_service_container_labels_traefik_additional_response_headers_auto: {} matrix_livekit_jwt_service_container_labels_traefik_additional_response_headers_custom: {} -# matrix_client_element_container_labels_additional_labels contains a multiline string with additional labels to add to the container label file. +# matrix_livekit_jwt_service_container_labels_additional_labels contains a multiline string with additional labels to add to the container label file. # See `../templates/labels.j2` for details. # # Example: -# matrix_client_element_container_labels_additional_labels: | +# matrix_livekit_jwt_service_container_labels_additional_labels: | # my.label=1 # another.label="here" matrix_livekit_jwt_service_container_labels_additional_labels: '' diff --git a/roles/custom/matrix-livekit-jwt-service/templates/labels.j2 b/roles/custom/matrix-livekit-jwt-service/templates/labels.j2 index 110d49edb..c372cbb78 100644 --- a/roles/custom/matrix-livekit-jwt-service/templates/labels.j2 +++ b/roles/custom/matrix-livekit-jwt-service/templates/labels.j2 @@ -5,7 +5,7 @@ SPDX-FileCopyrightText: 2024 - 2025 Slavi Pantaleev SPDX-License-Identifier: AGPL-3.0-or-later #} -{% if matrix_element_call_container_labels_traefik_enabled %} +{% if matrix_livekit_jwt_service_container_labels_traefik_enabled %} traefik.enable=true traefik.docker.network={{ matrix_livekit_jwt_service_container_labels_traefik_docker_network }} diff --git a/roles/custom/matrix-livekit-server/tasks/install.yml b/roles/custom/matrix-livekit-server/tasks/install.yml index a76759113..7d4e88ba8 100644 --- a/roles/custom/matrix-livekit-server/tasks/install.yml +++ b/roles/custom/matrix-livekit-server/tasks/install.yml @@ -56,7 +56,7 @@ dest: "{{ livekit_server_container_src_files_path }}" force: "yes" become: true - become_user: "{{ matrix_user_username }}" + become_user: "{{ livekit_server_uid }}" register: livekit_server_git_pull_results - name: Ensure LiveKit Server container image is built