mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-12-25 02:18:31 +01:00
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
This commit is contained in:
parent
6ebebcaa81
commit
69f71f48a6
@ -12,9 +12,9 @@ matrix_registration_config_path: "{{ matrix_registration_base_path }}/config"
|
|||||||
matrix_registration_data_path: "{{ matrix_registration_base_path }}/data"
|
matrix_registration_data_path: "{{ matrix_registration_base_path }}/data"
|
||||||
matrix_registration_docker_src_files_path: "{{ matrix_registration_base_path }}/docker-src"
|
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_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') }}"
|
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).
|
# (only applies when matrix-nginx-proxy is used).
|
||||||
matrix_registration_public_endpoint: /matrix-registration
|
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_register_endpoint: "{{ matrix_homeserver_url }}{{ matrix_registration_public_endpoint }}/register"
|
||||||
matrix_registration_api_token_endpoint: "{{ matrix_homeserver_url }}{{ matrix_registration_public_endpoint }}/token"
|
matrix_registration_api_token_endpoint: "{{ matrix_homeserver_url }}{{ matrix_registration_public_endpoint }}/token"
|
||||||
|
|
||||||
|
@ -30,15 +30,12 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
{#
|
{#
|
||||||
Workaround matrix-registration serving static files at /static
|
Workaround matrix-registration serving the background image at /static
|
||||||
(see https://github.com/ZerataX/matrix-registration/issues/29)
|
(see https://github.com/ZerataX/matrix-registration/issues/47)
|
||||||
|
|
||||||
Also fixing the form, which goes to /register.
|
|
||||||
#}
|
#}
|
||||||
sub_filter_once off;
|
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 "/static/" "{{ matrix_registration_public_endpoint }}/static/";
|
||||||
sub_filter "/register" "{{ matrix_registration_public_endpoint }}/register";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- name: Register matrix-registration proxying configuration with matrix-nginx-proxy
|
- name: Register matrix-registration proxying configuration with matrix-nginx-proxy
|
||||||
|
@ -28,3 +28,4 @@ logging:
|
|||||||
# password requirements
|
# password requirements
|
||||||
password:
|
password:
|
||||||
min_length: 8
|
min_length: 8
|
||||||
|
base_url: {{ matrix_registration_base_url|to_json }}
|
||||||
|
Loading…
Reference in New Issue
Block a user