pub-solar/matrix-docker-ansible-deploy
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #657 from cnvandijk/feature-client-well-known

Browse source 
Client well known compatibility
This commit is contained in:
Slavi Pantaleev 2020-09-28 09:19:25 +03:00 committed by GitHub
parent 3e2f0a4240 b9c8d059d0
commit 263727095d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
group_vars/matrix_servers
View file

@ -18,8 +18,6 @@
matrix_identity_server_url: "{{ ('https://' + matrix_server_fqn_matrix) if matrix_ma1sd_enabled else None }}" matrix_identity_server_url: "{{ ('https://' + matrix_server_fqn_matrix) if matrix_ma1sd_enabled else None }}"
matrix_riot_jitsi_preferredDomain: "{{ matrix_server_fqn_jitsi if matrix_jitsi_enabled else '' }}"
###################################################################### ######################################################################
# #
# /matrix-base # /matrix-base

8
roles/matrix-base/defaults/main.yml
View file

@ -59,13 +59,13 @@ 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/riot-web/blob/develop/docs/jitsi.md#configuring-riot-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_riot_jitsi_preferredDomain: '' matrix_client_element_jitsi_preferredDomain: ''
# 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.
# See: https://github.com/vector-im/riot-web/blob/develop/docs/e2ee.md # See: https://github.com/vector-im/element-web/blob/develop/docs/e2ee.md
matrix_riot_e2ee_default: true matrix_client_element_e2ee_default: true
# The Docker network that all services would be put into # The Docker network that all services would be put into
matrix_docker_network: "matrix" matrix_docker_network: "matrix"

12
roles/matrix-base/templates/static-files/well-known/matrix-client.j2
View file

@ -18,12 +18,18 @@
] ]
} }
{% endif %} {% endif %}
{% if matrix_riot_jitsi_preferredDomain %}, {% if matrix_client_element_jitsi_preferredDomain %},
"io.element.jitsi": {
"preferredDomain": {{ matrix_client_element_jitsi_preferredDomain|to_json }}
},
"im.vector.riot.jitsi": { "im.vector.riot.jitsi": {
"preferredDomain": {{ matrix_riot_jitsi_preferredDomain|to_json }} "preferredDomain": {{ matrix_client_element_jitsi_preferredDomain|to_json }}
} }
{% endif %} {% endif %}
{% if not matrix_riot_e2ee_default %}, {% if not matrix_client_element_e2ee_default %},
"io.element.e2ee": {
"default": false
},
"im.vector.riot.e2ee": { "im.vector.riot.e2ee": {
"default": false "default": false
} }