pub-solar/matrix-docker-ansible-deploy
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into postgres-per-default

Browse source
This commit is contained in:
Slavi Pantaleev 2020-12-15 22:02:52 +02:00
parent e2ba46bf01 69f71f48a6
commit 3289298ac7
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/configuring-playbook-own-webserver.md
View file

@ -144,7 +144,7 @@ matrix_nginx_proxy_container_extra_arguments:
- '--label "traefik.enable=true"' - '--label "traefik.enable=true"'
# The Nginx proxy container will receive traffic from these subdomains # The Nginx proxy container will receive traffic from these subdomains
- '--label "traefik.http.routers.matrix-nginx-proxy.rule=Host(`{{ matrix_server_fqn_matrix }}`,`{{ matrix_server_fqn_element }}`,`{{ matrix_server_fqn_dimension }},`{{ matrix_server_fqn_jitsi }}`)"' - '--label "traefik.http.routers.matrix-nginx-proxy.rule=Host(`{{ matrix_server_fqn_matrix }}`,`{{ matrix_server_fqn_element }}`,`{{ matrix_server_fqn_dimension }}`,`{{ matrix_server_fqn_jitsi }}`)"'
# (The 'web-secure' entrypoint must bind to port 443 in Traefik config) # (The 'web-secure' entrypoint must bind to port 443 in Traefik config)
- '--label "traefik.http.routers.matrix-nginx-proxy.entrypoints=web-secure"' - '--label "traefik.http.routers.matrix-nginx-proxy.entrypoints=web-secure"'

6
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_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') }}"
@ -66,6 +66,8 @@ matrix_registration_db: "{{
# (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"

9
roles/matrix-registration/tasks/init.yml
View file

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

1
roles/matrix-registration/templates/config.yaml.j2
View file

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