From e42fe4b18c81f891c56eb5257f60dc95c36e9166 Mon Sep 17 00:00:00 2001
From: Aaron Raimist <aaron@raim.ist>
Date: Sat, 27 Apr 2019 17:09:21 -0500
Subject: [PATCH] Include Slavi's improvements to keep roles independent

---
 group_vars/matrix-servers                      | 7 +++++++
 roles/matrix-riot-web/defaults/main.yml        | 3 +++
 roles/matrix-riot-web/templates/config.json.j2 | 6 ++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/group_vars/matrix-servers b/group_vars/matrix-servers
index facf1b84e..6f1048929 100755
--- a/group_vars/matrix-servers
+++ b/group_vars/matrix-servers
@@ -321,6 +321,13 @@ matrix_riot_web_self_check_validate_certificates: "{{ false if matrix_ssl_retrie
 
 matrix_riot_web_registration_enabled: "{{ matrix_synapse_enable_registration }}"
 
+matrix_riot_web_enable_presence_by_hs_url: |
+  {{
+    none
+    if matrix_synapse_use_presence
+    else {matrix_riot_web_default_hs_url: false}
+  }}
+
 ######################################################################
 #
 # /matrix-riot-web
diff --git a/roles/matrix-riot-web/defaults/main.yml b/roles/matrix-riot-web/defaults/main.yml
index b1112eeee..e17663b09 100644
--- a/roles/matrix-riot-web/defaults/main.yml
+++ b/roles/matrix-riot-web/defaults/main.yml
@@ -31,3 +31,6 @@ matrix_riot_web_self_check_validate_certificates: true
 
 # don't show the registration button on welcome page
 matrix_riot_web_registration_enabled: false
+
+# Controls whether Riot shows the presence features
+matrix_riot_web_enable_presence_by_hs_url: ~
diff --git a/roles/matrix-riot-web/templates/config.json.j2 b/roles/matrix-riot-web/templates/config.json.j2
index 207b58fd9..477fe4da1 100644
--- a/roles/matrix-riot-web/templates/config.json.j2
+++ b/roles/matrix-riot-web/templates/config.json.j2
@@ -14,10 +14,8 @@
 		"servers": {{ matrix_riot_web_roomdir_servers|to_json }}
 	},
 	"welcomeUserId": {{ matrix_riot_web_welcome_user_id|to_json }},
-	{% if matrix_synapse_use_presence|to_json %}
-	"enable_presence_by_hs_url": {
-		{{ matrix_riot_web_default_hs_url|to_json }}: false
-	},
+	{% if matrix_riot_web_enable_presence_by_hs_url is not none %}
+		"enable_presence_by_hs_url": {{ matrix_riot_web_enable_presence_by_hs_url|to_json }},
 	{% endif %}
 	"embeddedPages": {
 		"homeUrl": {{ matrix_riot_web_embedded_pages_home_url|to_json }}