From 69f71f48a660a104bd394309edae83026e75636c Mon Sep 17 00:00:00 2001
From: Slavi Pantaleev <slavi@devture.com>
Date: Tue, 15 Dec 2020 22:00:24 +0200
Subject: [PATCH] Upgrade matrix-registration (v0.7.1 -> 0.7.2) and use
 official image

This switches us to a container image maintained by the
matrix-registration developer.

0.7.2 also supports a `base_url` configuration option we can use to
make it easier to reverse-proxy at a different base URL.

We still keep some workarounds, because of this issue:
https://github.com/ZerataX/matrix-registration/issues/47
---
 roles/matrix-registration/defaults/main.yml        | 6 ++++--
 roles/matrix-registration/tasks/init.yml           | 9 +++------
 roles/matrix-registration/templates/config.yaml.j2 | 1 +
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/roles/matrix-registration/defaults/main.yml b/roles/matrix-registration/defaults/main.yml
index 95147665..d89bf070 100644
--- a/roles/matrix-registration/defaults/main.yml
+++ b/roles/matrix-registration/defaults/main.yml
@@ -12,9 +12,9 @@ matrix_registration_config_path: "{{ matrix_registration_base_path }}/config"
 matrix_registration_data_path: "{{ matrix_registration_base_path }}/data"
 matrix_registration_docker_src_files_path: "{{ matrix_registration_base_path }}/docker-src"
 
-matrix_registration_version: "v0.7.1"
+matrix_registration_version: "v0.7.2"
 
-matrix_registration_docker_image: "{{ matrix_registration_docker_image_name_prefix }}devture/zeratax-matrix-registration:{{ matrix_registration_version }}"
+matrix_registration_docker_image: "{{ matrix_registration_docker_image_name_prefix }}zeratax/matrix-registration:{{ matrix_registration_version }}"
 matrix_registration_docker_image_name_prefix: "{{ 'localhost/' if matrix_registration_container_image_self_build else 'docker.io/' }}"
 matrix_registration_docker_image_force_pull: "{{ matrix_registration_docker_image.endswith(':latest') }}"
 
@@ -36,6 +36,8 @@ matrix_registration_container_http_host_bind_port: ''
 # (only applies when matrix-nginx-proxy is used).
 matrix_registration_public_endpoint: /matrix-registration
 
+matrix_registration_base_url: "{{ matrix_registration_public_endpoint }}"
+
 matrix_registration_api_register_endpoint: "{{ matrix_homeserver_url }}{{ matrix_registration_public_endpoint }}/register"
 matrix_registration_api_token_endpoint: "{{ matrix_homeserver_url }}{{ matrix_registration_public_endpoint }}/token"
 
diff --git a/roles/matrix-registration/tasks/init.yml b/roles/matrix-registration/tasks/init.yml
index 8a7cdc75..bdb3928e 100644
--- a/roles/matrix-registration/tasks/init.yml
+++ b/roles/matrix-registration/tasks/init.yml
@@ -30,15 +30,12 @@
         {% endif %}
 
           {#
-            Workaround matrix-registration serving static files at /static
-            (see https://github.com/ZerataX/matrix-registration/issues/29)
-
-            Also fixing the form, which goes to /register.
+            Workaround matrix-registration serving the background image at /static
+            (see https://github.com/ZerataX/matrix-registration/issues/47)
           #}
           sub_filter_once off;
-          sub_filter_types text/html text/css;
+          sub_filter_types text/css;
           sub_filter "/static/" "{{ matrix_registration_public_endpoint }}/static/";
-          sub_filter "/register" "{{ matrix_registration_public_endpoint }}/register";
         }
 
   - name: Register matrix-registration proxying configuration with matrix-nginx-proxy
diff --git a/roles/matrix-registration/templates/config.yaml.j2 b/roles/matrix-registration/templates/config.yaml.j2
index f3b1c57b..1b2464e5 100644
--- a/roles/matrix-registration/templates/config.yaml.j2
+++ b/roles/matrix-registration/templates/config.yaml.j2
@@ -28,3 +28,4 @@ logging:
 # password requirements
 password:
   min_length: 8
+base_url: {{ matrix_registration_base_url|to_json }}