Просмотр исходного кода

Split `matrix_coturn_systemd_required_services_list` into `_default`, `_auto` and `_custom`

pull/4234/head
Slavi Pantaleev 11 месяцев назад
Родитель
Сommit
7fe25ef0fc
2 измененных файлов: 5 добавлений и 4 удалений
  1. +1
    -3
      group_vars/matrix_servers
  2. +4
    -1
      roles/custom/matrix-coturn/defaults/main.yml

+ 1
- 3
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 [])
}}



+ 4
- 1
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,


Загрузка…
Отмена
Сохранить