Browse Source

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
pull/758/head
Slavi Pantaleev 5 years ago
parent
commit
69f71f48a6
3 changed files with 8 additions and 8 deletions
  1. +4
    -2
      roles/matrix-registration/defaults/main.yml
  2. +3
    -6
      roles/matrix-registration/tasks/init.yml
  3. +1
    -0
      roles/matrix-registration/templates/config.yaml.j2

+ 4
- 2
roles/matrix-registration/defaults/main.yml View File

@@ -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"



+ 3
- 6
roles/matrix-registration/tasks/init.yml View File

@@ -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


+ 1
- 0
roles/matrix-registration/templates/config.yaml.j2 View File

@@ -28,3 +28,4 @@ logging:
# password requirements
password:
min_length: 8
base_url: {{ matrix_registration_base_url|to_json }}

Loading…
Cancel
Save