From 7fe25ef0fcbf309c2a7d467c3a057957ea15a78f Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Sun, 6 Apr 2025 15:36:51 +0300 Subject: [PATCH] Split `matrix_coturn_systemd_required_services_list` into `_default`, `_auto` and `_custom` --- group_vars/matrix_servers | 4 +--- roles/custom/matrix-coturn/defaults/main.yml | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers index 17a8791a2..dc0979388 100755 --- a/group_vars/matrix_servers +++ b/group_vars/matrix_servers @@ -3568,10 +3568,8 @@ matrix_coturn_container_additional_volumes: | ) }} -matrix_coturn_systemd_required_services_list: | +matrix_coturn_systemd_required_services_list_auto: | {{ - [devture_systemd_docker_base_docker_service_name] - + ([traefik_certs_dumper_identifier + '-wait-for-domain@' + matrix_server_fqn_matrix + '.service'] if matrix_playbook_reverse_proxy_type in ['playbook-managed-traefik', 'other-traefik-container'] and traefik_certs_dumper_enabled and matrix_coturn_tls_enabled else []) }} diff --git a/roles/custom/matrix-coturn/defaults/main.yml b/roles/custom/matrix-coturn/defaults/main.yml index 9c82097c4..84e1d42c2 100644 --- a/roles/custom/matrix-coturn/defaults/main.yml +++ b/roles/custom/matrix-coturn/defaults/main.yml @@ -56,7 +56,10 @@ matrix_coturn_docker_src_files_path: "{{ matrix_coturn_base_path }}/docker-src" matrix_coturn_config_path: "{{ matrix_coturn_base_path }}/turnserver.conf" # List of systemd services that matrix-coturn.service depends on -matrix_coturn_systemd_required_services_list: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}" +matrix_coturn_systemd_required_services_list: "{{ matrix_coturn_systemd_required_services_list_default + matrix_coturn_systemd_required_services_list_auto + matrix_coturn_systemd_required_services_list_custom }}" +matrix_coturn_systemd_required_services_list_default: "{{ [devture_systemd_docker_base_docker_service_name] if devture_systemd_docker_base_docker_service_name else [] }}" +matrix_coturn_systemd_required_services_list_auto: [] +matrix_coturn_systemd_required_services_list_custom: [] # A list of additional "volumes" to mount in the container. # This list gets populated dynamically at runtime. You can provide a different default value,