Explorar el Código

Use the standard LiveKit JWT extra arguments variable

pull/5555/merge
Slavi Pantaleev hace 2 días
padre
commit
ff90752790
Se han modificado 3 ficheros con 2 adiciones y 4 borrados
  1. +0
    -3
      roles/custom/matrix-livekit-jwt-service/defaults/main.yml
  2. +1
    -0
      roles/custom/matrix-livekit-jwt-service/tasks/validate_config.yml
  3. +1
    -1
      roles/custom/matrix-livekit-jwt-service/templates/systemd/matrix-livekit-jwt-service.service.j2

+ 0
- 3
roles/custom/matrix-livekit-jwt-service/defaults/main.yml Ver fichero

@@ -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). # installation tasks haven't run (e.g., due to --tags skipping them).
matrix_livekit_jwt_service_restart_necessary: false 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. # A list of additional "volumes" to mount in the container.
# Contains definition objects like this: `{"type": "bind", "src": "/outside", "dst": "/inside", "options": "readonly"}. # Contains definition objects like this: `{"type": "bind", "src": "/outside", "dst": "/inside", "options": "readonly"}.
# See the `--mount` documentation for the `docker run` command. # See the `--mount` documentation for the `docker run` command.


+ 1
- 0
roles/custom/matrix-livekit-jwt-service/tasks/validate_config.yml Ver fichero

@@ -15,6 +15,7 @@
with_items: with_items:
- {'old': 'matrix_livekit_jwt_service_environment_variable_livekit_jwt_port', 'new': 'matrix_livekit_jwt_service_container_port'} - {'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_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 - name: Fail if required LiveKit JWT Service settings are not defined
ansible.builtin.fail: ansible.builtin.fail:


+ 1
- 1
roles/custom/matrix-livekit-jwt-service/templates/systemd/matrix-livekit-jwt-service.service.j2 Ver fichero

@@ -28,7 +28,7 @@ ExecStartPre={{ devture_systemd_docker_base_host_command_docker }} create \
{% for volume in matrix_livekit_jwt_service_container_additional_volumes %} {% 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 '' }} \ --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 %} {% endfor %}
{% for arg in matrix_livekit_jwt_service_container_additional_arguments %}
{% for arg in matrix_livekit_jwt_service_container_extra_arguments %}
{{ arg }} \ {{ arg }} \
{% endfor %} {% endfor %}
--env-file={{ matrix_livekit_jwt_service_base_path }}/env \ --env-file={{ matrix_livekit_jwt_service_base_path }}/env \


Cargando…
Cancelar
Guardar