From f6b0f0a477c71d417fce603f7c7f6a0662f13cae Mon Sep 17 00:00:00 2001
From: Chris van Dijk <c.vandijk@cosine.nl>
Date: Sat, 26 Sep 2020 16:24:09 +0000
Subject: [PATCH 1/2] Rename matrix_riot_jitsi_preferredDomain and
matrix_riot_e2ee_default to Element
---
group_vars/matrix_servers | 2 --
roles/matrix-base/defaults/main.yml | 8 ++++----
.../templates/static-files/well-known/matrix-client.j2 | 6 +++---
3 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index b82dbf23a..c399fb895 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -18,8 +18,6 @@
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
diff --git a/roles/matrix-base/defaults/main.yml b/roles/matrix-base/defaults/main.yml
index c70781b31..3fbbd76ea 100644
--- a/roles/matrix-base/defaults/main.yml
+++ b/roles/matrix-base/defaults/main.yml
@@ -59,13 +59,13 @@ matrix_integration_manager_ui_url: ~
# 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.
-# See: https://github.com/vector-im/riot-web/blob/develop/docs/jitsi.md#configuring-riot-to-use-your-self-hosted-jitsi-server
-matrix_riot_jitsi_preferredDomain: ''
+# 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: ''
# 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.
-# See: https://github.com/vector-im/riot-web/blob/develop/docs/e2ee.md
-matrix_riot_e2ee_default: true
+# See: https://github.com/vector-im/element-web/blob/develop/docs/e2ee.md
+matrix_client_element_e2ee_default: true
# The Docker network that all services would be put into
matrix_docker_network: "matrix"
diff --git a/roles/matrix-base/templates/static-files/well-known/matrix-client.j2 b/roles/matrix-base/templates/static-files/well-known/matrix-client.j2
index a4c1c4391..3df0037bd 100644
--- a/roles/matrix-base/templates/static-files/well-known/matrix-client.j2
+++ b/roles/matrix-base/templates/static-files/well-known/matrix-client.j2
@@ -18,12 +18,12 @@
]
}
{% endif %}
- {% if matrix_riot_jitsi_preferredDomain %},
+ {% if matrix_client_element_jitsi_preferredDomain %},
"im.vector.riot.jitsi": {
- "preferredDomain": {{ matrix_riot_jitsi_preferredDomain|to_json }}
+ "preferredDomain": {{ matrix_client_element_jitsi_preferredDomain|to_json }}
}
{% endif %}
- {% if not matrix_riot_e2ee_default %},
+ {% if not matrix_client_element_e2ee_default %},
"im.vector.riot.e2ee": {
"default": false
}
From b9c8d059d02ec59c6f7947ded42043996d304428 Mon Sep 17 00:00:00 2001
From: Chris van Dijk <c.vandijk@cosine.nl>
Date: Sat, 26 Sep 2020 16:27:40 +0000
Subject: [PATCH 2/2] Support both the im.vector.riot and io.element variants
in client .well-known
According to the docs, "e2ee" is already under "io.element":
https://github.com/vector-im/element-web/blob/develop/docs/e2ee.md#disabling-encryption-by-default
however "jitsi" is still under "im.vector.riot":
https://github.com/vector-im/element-web/blob/develop/docs/jitsi.md#configuring-element-to-use-your-self-hosted-jitsi-server
For now let's just maintain backward and forward compatibility for both
settings since the client version is out of the control of this
playbook.
---
.../templates/static-files/well-known/matrix-client.j2 | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/roles/matrix-base/templates/static-files/well-known/matrix-client.j2 b/roles/matrix-base/templates/static-files/well-known/matrix-client.j2
index 3df0037bd..6dc5ff23c 100644
--- a/roles/matrix-base/templates/static-files/well-known/matrix-client.j2
+++ b/roles/matrix-base/templates/static-files/well-known/matrix-client.j2
@@ -19,11 +19,17 @@
}
{% endif %}
{% if matrix_client_element_jitsi_preferredDomain %},
+ "io.element.jitsi": {
+ "preferredDomain": {{ matrix_client_element_jitsi_preferredDomain|to_json }}
+ },
"im.vector.riot.jitsi": {
"preferredDomain": {{ matrix_client_element_jitsi_preferredDomain|to_json }}
}
{% endif %}
{% if not matrix_client_element_e2ee_default %},
+ "io.element.e2ee": {
+ "default": false
+ },
"im.vector.riot.e2ee": {
"default": false
}