From 4752e7f9a06f93e2c35642b7cf2e09bad0ec005b Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Thu, 4 Jan 2024 10:27:32 +0200
Subject: [PATCH] Get rid of
 matrix_nginx_proxy_proxy_matrix_client_redirect_root_uri_to_domain

---
 group_vars/matrix_servers                                   | 2 --
 roles/custom/matrix-nginx-proxy/defaults/main.yml           | 6 ------
 .../templates/nginx/conf.d/matrix-domain.conf.j2            | 6 +-----
 .../matrix_playbook_migration/tasks/validate_config.yml     | 1 +
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/group_vars/matrix_servers b/group_vars/matrix_servers
index df94f0817..67cdc6419 100755
--- a/group_vars/matrix_servers
+++ b/group_vars/matrix_servers
@@ -2916,8 +2916,6 @@ matrix_nginx_proxy_proxy_matrix_client_api_client_max_body_size_mb: |-
 
 matrix_nginx_proxy_proxy_matrix_client_api_forwarded_location_synapse_admin_api_enabled: "{{ matrix_synapse_admin_enabled or matrix_bot_matrix_registration_bot_enabled }}"
 
-matrix_nginx_proxy_proxy_matrix_client_redirect_root_uri_to_domain: "{{ matrix_server_fqn_element if matrix_client_element_enabled else '' }}"
-
 matrix_nginx_proxy_proxy_matrix_enabled: true
 matrix_nginx_proxy_proxy_element_enabled: "{{ matrix_client_element_enabled and matrix_playbook_reverse_proxy_type in ['playbook-managed-nginx', 'other-nginx-non-container'] }}"
 matrix_nginx_proxy_proxy_hydrogen_enabled: "{{ matrix_client_hydrogen_enabled and matrix_playbook_reverse_proxy_type in ['playbook-managed-nginx', 'other-nginx-non-container'] }}"
diff --git a/roles/custom/matrix-nginx-proxy/defaults/main.yml b/roles/custom/matrix-nginx-proxy/defaults/main.yml
index 917151a1f..6ae3e2c76 100644
--- a/roles/custom/matrix-nginx-proxy/defaults/main.yml
+++ b/roles/custom/matrix-nginx-proxy/defaults/main.yml
@@ -351,12 +351,6 @@ matrix_nginx_proxy_proxy_matrix_client_api_forwarded_location_prefix_regexes: |
     (['/_synapse/admin'] if matrix_nginx_proxy_proxy_matrix_client_api_forwarded_location_synapse_admin_api_enabled else [])
   }}
 
-# Specifies where requests for the root URI (`/`) on the `matrix.` domain should be redirected.
-# If this has an empty value, they're just passed to the homeserver, which serves a static page.
-# If you'd like to make `https://matrix.DOMAIN` redirect to `https://element.DOMAIN` (or something of that sort), specify the domain name here.
-# Example value: `element.DOMAIN` (or `{{ matrix_server_fqn_element }}`).
-matrix_nginx_proxy_proxy_matrix_client_redirect_root_uri_to_domain: ""
-
 # Controls whether proxying for the Matrix Federation API should be done.
 matrix_nginx_proxy_proxy_matrix_federation_api_enabled: false
 matrix_nginx_proxy_proxy_matrix_federation_api_addr_with_container: "matrix-nginx-proxy:12088"
diff --git a/roles/custom/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2 b/roles/custom/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2
index 78431c4f2..9ab540746 100644
--- a/roles/custom/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2
+++ b/roles/custom/matrix-nginx-proxy/templates/nginx/conf.d/matrix-domain.conf.j2
@@ -257,11 +257,7 @@
 		See: https://github.com/spantaleev/matrix-docker-ansible-deploy/issues/1058
 	#}
 	location ~* ^/$ {
-		{% if matrix_nginx_proxy_proxy_matrix_client_redirect_root_uri_to_domain %}
-			return 302 {{ matrix_nginx_proxy_x_forwarded_proto_value }}://{{ matrix_nginx_proxy_proxy_matrix_client_redirect_root_uri_to_domain }}$request_uri;
-		{% else %}
-			rewrite ^/$ /_matrix/static/ last;
-		{% endif %}
+		rewrite ^/$ /_matrix/static/ last;
 	}
 {% endmacro %}
 
diff --git a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml
index dd818f1fc..f5b532e21 100644
--- a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml
+++ b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml
@@ -83,6 +83,7 @@
     - {'old': 'matrix_nginx_proxy_base_domain_create_directory', 'new': '<no longer necessary; see matrix_static_files_file_index_html_enabled>'}
     - {'old': 'matrix_nginx_proxy_proxy_riot_compat_redirect_enabled', 'new': '<redirecting the riot domain to an element domain is no longer supported - you can implement it yourself using matrix_client_element_container_labels_additional_labels>'}
     - {'old': 'matrix_nginx_proxy_proxy_riot_compat_redirect_hostname', 'new': '<redirecting the riot domain to an element domain is no longer supported - you can implement it yourself using matrix_client_element_container_labels_additional_labels>'}
+    - {'old': 'matrix_nginx_proxy_proxy_matrix_client_redirect_root_uri_to_domain', 'new': '<superseded by matrix_synapse_container_labels_client_root_redirection_url or matrix_synapse_reverse_proxy_companion_container_labels_client_root_redirection_url or another equivalent based on the homeserver implementation you use>'}
 
 - name: (Deprecation) Catch and report matrix_postgres variables
   ansible.builtin.fail: