From 3632c158f3f9036fd71bf0ed1b86d286407bb935 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 18 Jul 2022 11:06:44 +0200
Subject: [PATCH] Implement feedback from PR #1931

---
 roles/matrix-base/tasks/setup_well_known.yml             | 1 -
 .../templates/static-files/well-known/matrix-support.j2  | 4 +---
 roles/matrix-nginx-proxy/tasks/setup_well_known.yml      | 9 ---------
 3 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/roles/matrix-base/tasks/setup_well_known.yml b/roles/matrix-base/tasks/setup_well_known.yml
index 8faf100c0..44ef3d28a 100644
--- a/roles/matrix-base/tasks/setup_well_known.yml
+++ b/roles/matrix-base/tasks/setup_well_known.yml
@@ -43,4 +43,3 @@
     mode: 0644
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
-  when: matrix_homeserver_admin_contacts|length > 0
diff --git a/roles/matrix-base/templates/static-files/well-known/matrix-support.j2 b/roles/matrix-base/templates/static-files/well-known/matrix-support.j2
index 18a5403c9..fd27432b5 100644
--- a/roles/matrix-base/templates/static-files/well-known/matrix-support.j2
+++ b/roles/matrix-base/templates/static-files/well-known/matrix-support.j2
@@ -1,9 +1,7 @@
 #jinja2: lstrip_blocks: "True"
 {
-	{% if matrix_homeserver_admin_contacts|length > 0 %}
     "admins": {{ matrix_homeserver_admin_contacts|to_json }}
-	{% endif %}
 	{% if matrix_homeserver_support_url %},
-    "support_page": "{{ matrix_homeserver_support_url }}"
+    "support_page": "{{ matrix_homeserver_support_url|to_json }}"
 	{% endif %}
 }
diff --git a/roles/matrix-nginx-proxy/tasks/setup_well_known.yml b/roles/matrix-nginx-proxy/tasks/setup_well_known.yml
index b0df3fad7..1c85552c3 100644
--- a/roles/matrix-nginx-proxy/tasks/setup_well_known.yml
+++ b/roles/matrix-nginx-proxy/tasks/setup_well_known.yml
@@ -23,12 +23,3 @@
     mode: 0644
     owner: "{{ matrix_user_username }}"
     group: "{{ matrix_user_groupname }}"
-
-- name: Ensure Matrix /.well-known/matrix/support configured
-  template:
-    src: "{{ role_path }}/templates/well-known/matrix-support.j2"
-    dest: "{{ matrix_static_files_base_path }}/.well-known/matrix"
-    mode: 0644
-    owner: "{{ matrix_user_username }}"
-    group: "{{ matrix_user_groupname }}"
-  when: matrix_homeserver_admin_contacts|length > 0