From 13e47fc3f555c48a8eb308d1abd318dab0ff4cea Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Fri, 12 Jan 2024 16:33:44 +0200
Subject: [PATCH] Remove matrix-nginx-proxy integration support from
 matrix-synapse-admin

---
 .../tasks/inject_into_nginx_proxy.yml         | 46 -------------------
 .../matrix-synapse-admin/tasks/main.yml       |  9 ----
 .../tasks/validate_config.yml                 |  1 +
 3 files changed, 1 insertion(+), 55 deletions(-)
 delete mode 100644 roles/custom/matrix-synapse-admin/tasks/inject_into_nginx_proxy.yml

diff --git a/roles/custom/matrix-synapse-admin/tasks/inject_into_nginx_proxy.yml b/roles/custom/matrix-synapse-admin/tasks/inject_into_nginx_proxy.yml
deleted file mode 100644
index a06f47a1d..000000000
--- a/roles/custom/matrix-synapse-admin/tasks/inject_into_nginx_proxy.yml
+++ /dev/null
@@ -1,46 +0,0 @@
----
-
-- name: Fail if matrix-nginx-proxy role already executed
-  ansible.builtin.fail:
-    msg: >-
-      Trying to append Synapse Admin's reverse-proxying configuration to matrix-nginx-proxy,
-      but it's pointless since the matrix-nginx-proxy role had already executed.
-      To fix this, please change the order of roles in your playbook,
-      so that the matrix-nginx-proxy role would run after the matrix-synapse-admin role.
-  when: matrix_nginx_proxy_role_executed | default(False) | bool
-
-- name: Generate Synapse Admin proxying configuration for matrix-nginx-proxy
-  ansible.builtin.set_fact:
-    matrix_synapse_admin_matrix_nginx_proxy_configuration: |
-      rewrite ^{{ matrix_synapse_admin_path_prefix }}$ {{ matrix_nginx_proxy_x_forwarded_proto_value }}://$server_name{{ matrix_synapse_admin_path_prefix }}/ permanent;
-
-      location ~ ^{{ matrix_synapse_admin_path_prefix }}/(.*) {
-      {% if matrix_nginx_proxy_enabled | default(False) %}
-        {# Use the embedded DNS resolver in Docker containers to discover the service #}
-        resolver 127.0.0.11 valid=5s;
-        set $backend "matrix-synapse-admin:80";
-        proxy_pass http://$backend/$1;
-      {% else %}
-        {# Generic configuration for use outside of our container setup #}
-        proxy_pass http://127.0.0.1:8766/$1;
-      {% endif %}
-      }
-
-- name: Register Synapse Admin proxying configuration with matrix-nginx-proxy
-  ansible.builtin.set_fact:
-    matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks: |
-      {{
-        matrix_nginx_proxy_proxy_matrix_additional_server_configuration_blocks | default([])
-        +
-        [matrix_synapse_admin_matrix_nginx_proxy_configuration]
-      }}
-
-- name: Warn about reverse-proxying if matrix-nginx-proxy not used
-  ansible.builtin.debug:
-    msg: >-
-      NOTE: You've enabled the Synapse Admin tool but are not using the matrix-nginx-proxy
-      reverse proxy.
-      Please make sure that you're proxying the `{{ matrix_synapse_admin_path_prefix }}`
-      URL endpoint to the matrix-synapse-admin container.
-      You can expose the container's port using the `matrix_synapse_admin_container_http_host_bind_port` variable.
-  when: "not matrix_nginx_proxy_enabled | default(False) | bool"
diff --git a/roles/custom/matrix-synapse-admin/tasks/main.yml b/roles/custom/matrix-synapse-admin/tasks/main.yml
index da9bdb18c..da3f2b56d 100644
--- a/roles/custom/matrix-synapse-admin/tasks/main.yml
+++ b/roles/custom/matrix-synapse-admin/tasks/main.yml
@@ -1,14 +1,5 @@
 ---
 
-- tags:
-    - setup-all
-    - setup-nginx-proxy
-    - install-all
-    - install-nginx-proxy
-  block:
-    - when: matrix_synapse_admin_enabled | bool and matrix_synapse_admin_nginx_proxy_integration_enabled | bool
-      ansible.builtin.include_tasks: "{{ role_path }}/tasks/inject_into_nginx_proxy.yml"
-
 - tags:
     - setup-all
     - setup-synapse-admin
diff --git a/roles/custom/matrix-synapse-admin/tasks/validate_config.yml b/roles/custom/matrix-synapse-admin/tasks/validate_config.yml
index d02819863..0fa3ce77b 100644
--- a/roles/custom/matrix-synapse-admin/tasks/validate_config.yml
+++ b/roles/custom/matrix-synapse-admin/tasks/validate_config.yml
@@ -11,6 +11,7 @@
     - {'old': 'matrix_synapse_admin_container_self_build', 'new': 'matrix_synapse_admin_container_image_self_build'}
     - {'old': 'matrix_synapse_admin_container_self_build_repo', 'new': 'matrix_synapse_admin_container_image_self_build_repo'}
     - {'old': 'matrix_synapse_admin_public_endpoint', 'new': 'matrix_synapse_admin_path_prefix'}
+    - {'old': 'matrix_synapse_admin_nginx_proxy_integration_enabled', 'new': '<removed>'}
 
 - when: matrix_synapse_admin_container_labels_traefik_enabled | bool
   block: