From ff90752790b8961e94ff6345f5c717fec935cbb3 Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Mon, 31 Aug 2026 06:43:22 +0300
Subject: [PATCH] Use the standard LiveKit JWT extra arguments variable

---
 roles/custom/matrix-livekit-jwt-service/defaults/main.yml      | 3 ---
 .../matrix-livekit-jwt-service/tasks/validate_config.yml       | 1 +
 .../templates/systemd/matrix-livekit-jwt-service.service.j2    | 2 +-
 3 files changed, 2 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 31fad4932..47ae57228 100644
--- a/roles/custom/matrix-livekit-jwt-service/defaults/main.yml
+++ b/roles/custom/matrix-livekit-jwt-service/defaults/main.yml
@@ -157,9 +157,6 @@ matrix_livekit_jwt_service_systemd_required_services_list_custom: []
 # installation tasks haven't run (e.g., due to --tags skipping them).
 matrix_livekit_jwt_service_restart_necessary: false
 
-# Support additional container arguments for the LiveKit JWT service
-matrix_livekit_jwt_service_container_additional_arguments: []
-
 # A list of additional "volumes" to mount in the container.
 # Contains definition objects like this: `{"type": "bind", "src": "/outside", "dst": "/inside", "options": "readonly"}.
 # See the `--mount` documentation for the `docker run` command.
diff --git a/roles/custom/matrix-livekit-jwt-service/tasks/validate_config.yml b/roles/custom/matrix-livekit-jwt-service/tasks/validate_config.yml
index da9550fb5..2bea8c070 100644
--- a/roles/custom/matrix-livekit-jwt-service/tasks/validate_config.yml
+++ b/roles/custom/matrix-livekit-jwt-service/tasks/validate_config.yml
@@ -15,6 +15,7 @@
   with_items:
     - {'old': 'matrix_livekit_jwt_service_environment_variable_livekit_jwt_port', 'new': 'matrix_livekit_jwt_service_container_port'}
     - {'old': 'matrix_livekit_jwt_service_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
+    - {'old': 'matrix_livekit_jwt_service_container_additional_arguments', 'new': 'matrix_livekit_jwt_service_container_extra_arguments'}
 
 - name: Fail if required LiveKit JWT Service settings are not defined
   ansible.builtin.fail:
diff --git a/roles/custom/matrix-livekit-jwt-service/templates/systemd/matrix-livekit-jwt-service.service.j2 b/roles/custom/matrix-livekit-jwt-service/templates/systemd/matrix-livekit-jwt-service.service.j2
index 706f5a004..bcfcc7fd3 100644
--- a/roles/custom/matrix-livekit-jwt-service/templates/systemd/matrix-livekit-jwt-service.service.j2
+++ b/roles/custom/matrix-livekit-jwt-service/templates/systemd/matrix-livekit-jwt-service.service.j2
@@ -28,7 +28,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
     {% for volume in matrix_livekit_jwt_service_container_additional_volumes %}
     --mount type={{ volume.type | default('bind' if '/' in volume.src else 'volume') }},src={{ volume.src }},dst={{ volume.dst }}{{ (',' + volume.options) if volume.options else '' }} \
     {% endfor %}
-    {% for arg in matrix_livekit_jwt_service_container_additional_arguments %}
+    {% for arg in matrix_livekit_jwt_service_container_extra_arguments %}
     {{ arg }} \
     {% endfor %}
     --env-file={{ matrix_livekit_jwt_service_base_path }}/env \