finallycoffee/matrix-docker-ansible-deploy
finallycoffee/matrix-docker-ansible-deploy
5
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename variable (matrix_client_element_jitsi_preferredDomain -> matrix_client_element_jitsi_preferredDomain)

Browse Source
This commit is contained in:
Slavi Pantaleev 2023-08-10 15:57:29 +03:00
parent e9c0e90147
commit ae12ab5c24
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
group_vars/matrix_servers
View File

@ -3341,7 +3341,7 @@ matrix_client_element_enable_presence_by_hs_url: |
matrix_client_element_welcome_user_id: ~ matrix_client_element_welcome_user_id: ~
matrix_client_element_jitsi_preferredDomain: "{{ matrix_server_fqn_jitsi if jitsi_enabled else '' }}" matrix_client_element_jitsi_preferred_domain: "{{ matrix_server_fqn_jitsi if jitsi_enabled else '' }}"
###################################################################### ######################################################################
# #

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

@ -158,7 +158,7 @@ matrix_integration_manager_ui_url: ~
# The domain name where a Jitsi server is self-hosted. # The domain name where a Jitsi server is self-hosted.
# If set, `/.well-known/matrix/client` will suggest Element clients to use that Jitsi server. # If set, `/.well-known/matrix/client` will suggest Element clients to use that Jitsi server.
# See: https://github.com/vector-im/element-web/blob/develop/docs/jitsi.md#configuring-element-to-use-your-self-hosted-jitsi-server # See: https://github.com/vector-im/element-web/blob/develop/docs/jitsi.md#configuring-element-to-use-your-self-hosted-jitsi-server
matrix_client_element_jitsi_preferredDomain: '' # noqa var-naming matrix_client_element_jitsi_preferred_domain: '' # noqa var-naming
# Controls whether Element should use End-to-End Encryption by default. # Controls whether Element should use End-to-End Encryption by default.
# Setting this to false will update `/.well-known/matrix/client` and tell Element clients to avoid E2EE. # Setting this to false will update `/.well-known/matrix/client` and tell Element clients to avoid E2EE.

6
roles/custom/matrix-base/templates/static-files/well-known/matrix-client.j2
View File

@ -18,12 +18,12 @@
] ]
} }
{% endif %} {% endif %}
{% if matrix_client_element_jitsi_preferredDomain %}, {% if matrix_client_element_jitsi_preferred_domain %},
"io.element.jitsi": { "io.element.jitsi": {
"preferredDomain": {{ matrix_client_element_jitsi_preferredDomain|to_json }} "preferredDomain": {{ matrix_client_element_jitsi_preferred_domain|to_json }}
}, },
"im.vector.riot.jitsi": { "im.vector.riot.jitsi": {
"preferredDomain": {{ matrix_client_element_jitsi_preferredDomain|to_json }} "preferredDomain": {{ matrix_client_element_jitsi_preferred_domain|to_json }}
} }
{% endif %} {% endif %}
{% if matrix_sliding_sync_enabled %}, {% if matrix_sliding_sync_enabled %},

2
roles/custom/matrix-client-element/defaults/main.yml
View File

@ -183,7 +183,7 @@ matrix_client_element_page_template_welcome_path: "{{ role_path }}/templates/wel
# point this to a `home.html` template file on your local filesystem. # point this to a `home.html` template file on your local filesystem.
matrix_client_element_embedded_pages_home_path: ~ matrix_client_element_embedded_pages_home_path: ~
matrix_client_element_jitsi_preferredDomain: '' # noqa var-naming matrix_client_element_jitsi_preferred_domain: '' # noqa var-naming
# Controls whether the self-check feature should validate SSL certificates. # Controls whether the self-check feature should validate SSL certificates.
matrix_client_element_self_check_validate_certificates: true matrix_client_element_self_check_validate_certificates: true

1
roles/custom/matrix-client-element/tasks/validate_config.yml
View File

@ -41,6 +41,7 @@
- {'old': 'matrix_client_element_branding_authFooterLinks', 'new': 'matrix_client_element_branding_auth_footer_links'} - {'old': 'matrix_client_element_branding_authFooterLinks', 'new': 'matrix_client_element_branding_auth_footer_links'}
- {'old': 'matrix_client_element_branding_authHeaderLogoUrl', 'new': 'matrix_client_element_branding_auth_header_logo_url'} - {'old': 'matrix_client_element_branding_authHeaderLogoUrl', 'new': 'matrix_client_element_branding_auth_header_logo_url'}
- {'old': 'matrix_client_element_branding_welcomeBackgroundUrl', 'new': 'matrix_client_element_branding_welcome_background_url'} - {'old': 'matrix_client_element_branding_welcomeBackgroundUrl', 'new': 'matrix_client_element_branding_welcome_background_url'}
- {'old': 'matrix_client_element_jitsi_preferredDomain', 'new': 'matrix_client_element_jitsi_preferred_domain'}
- when: matrix_client_element_container_labels_traefik_enabled | bool - when: matrix_client_element_container_labels_traefik_enabled | bool
block: block:

4
roles/custom/matrix-client-element/templates/config.json.j2
View File

@ -33,9 +33,9 @@
"embedded_pages": { "embedded_pages": {
"homeUrl": {{ matrix_client_element_embedded_pages_home_url | string | to_json }} "homeUrl": {{ matrix_client_element_embedded_pages_home_url | string | to_json }}
}, },
{% if matrix_client_element_jitsi_preferredDomain %} {% if matrix_client_element_jitsi_preferred_domain %}
"jitsi": { "jitsi": {
"preferred_domain": {{ matrix_client_element_jitsi_preferredDomain | to_json }} "preferred_domain": {{ matrix_client_element_jitsi_preferred_domain | to_json }}
}, },
{% endif %} {% endif %}
{% if matrix_client_element_location_sharing_enabled %} {% if matrix_client_element_location_sharing_enabled %}