Browse Source

Auto-configure MatrixRTC Livekit discovery URL

pull/5106/head
Slavi Pantaleev 2 months ago
parent
commit
bde4c57a4a
3 changed files with 8 additions and 4 deletions
  1. +1
    -1
      group_vars/matrix_servers
  2. +2
    -2
      roles/custom/matrix-continuwuity/defaults/main.yml
  3. +5
    -1
      roles/custom/matrix-continuwuity/templates/continuwuity.toml.j2

+ 1
- 1
group_vars/matrix_servers View File

@@ -5786,7 +5786,7 @@ matrix_continuwuity_container_labels_public_federation_api_traefik_tls: "{{ matr
matrix_continuwuity_container_labels_internal_client_api_enabled: "{{ matrix_playbook_internal_matrix_client_api_traefik_entrypoint_enabled }}" matrix_continuwuity_container_labels_internal_client_api_enabled: "{{ matrix_playbook_internal_matrix_client_api_traefik_entrypoint_enabled }}"
matrix_continuwuity_container_labels_internal_client_api_traefik_entrypoints: "{{ matrix_playbook_internal_matrix_client_api_traefik_entrypoint_name }}" matrix_continuwuity_container_labels_internal_client_api_traefik_entrypoints: "{{ matrix_playbook_internal_matrix_client_api_traefik_entrypoint_name }}"


matrix_continuwuity_config_rtc_foci: "{{ ( [{'type': 'livekit', 'livekit_service_url': matrix_livekit_jwt_service_public_url}] if matrix_livekit_jwt_service_enabled else [] ) }}"
matrix_continuwuity_config_rtc_foci_livekit_url: "{{ matrix_livekit_jwt_service_public_url if matrix_livekit_jwt_service_enabled else '' }}"


matrix_continuwuity_config_turn_uris: "{{ coturn_turn_uris if coturn_enabled else [] }}" matrix_continuwuity_config_turn_uris: "{{ coturn_turn_uris if coturn_enabled else [] }}"
matrix_continuwuity_config_turn_secret: "{{ coturn_turn_static_auth_secret if (coturn_enabled and coturn_authentication_method == 'auth-secret') else '' }}" matrix_continuwuity_config_turn_secret: "{{ coturn_turn_static_auth_secret if (coturn_enabled and coturn_authentication_method == 'auth-secret') else '' }}"


+ 2
- 2
roles/custom/matrix-continuwuity/defaults/main.yml View File

@@ -227,11 +227,11 @@ matrix_continuwuity_config_ignore_messages_from_server_names: []
# probably don't want to enable this. # probably don't want to enable this.
matrix_continuwuity_config_allow_outgoing_presence: false matrix_continuwuity_config_allow_outgoing_presence: false


# Controls MatrixRTC foci served via `/_matrix/client/v1/rtc/transports`
# Controls MatrixRTC Livekit URL served via `/_matrix/client/v1/rtc/transports`
# and `/_matrix/client/unstable/org.matrix.msc4143/rtc/transports` (MSC4143) # and `/_matrix/client/unstable/org.matrix.msc4143/rtc/transports` (MSC4143)
# #
# This is set automatically if you are using the playbook MatrixRTC stack. # This is set automatically if you are using the playbook MatrixRTC stack.
matrix_continuwuity_config_rtc_foci: []
matrix_continuwuity_config_rtc_foci_livekit_url: ''


# Controls the `url_preview_domain_contains_allowlist` setting. # Controls the `url_preview_domain_contains_allowlist` setting.
matrix_continuwuity_config_url_preview_domain_contains_allowlist: [] matrix_continuwuity_config_url_preview_domain_contains_allowlist: []


+ 5
- 1
roles/custom/matrix-continuwuity/templates/continuwuity.toml.j2 View File

@@ -1882,7 +1882,11 @@ url_preview_check_root_domain = {{ matrix_continuwuity_config_url_preview_check_
# #
# To disable, set this to an empty list (`[]`). # To disable, set this to an empty list (`[]`).
# #
foci = {{ matrix_continuwuity_config_rtc_foci | to_json }}
{% if matrix_continuwuity_config_rtc_foci_livekit_url != '' %}
foci = [{ type = "livekit", livekit_service_url = {{ matrix_continuwuity_config_rtc_foci_livekit_url | to_json }} }]
{% else %}
foci = []
{% endif %}


[global.ldap] [global.ldap]




Loading…
Cancel
Save