mirror of
https://github.com/spantaleev/matrix-docker-ansible-deploy.git
synced 2024-11-10 04:37:36 +01:00
Remove matrix-nginx-proxy integration for matrix-bridge-mautrix-wsproxy
This probably never even worked anyway and was a leftover copy/paste from some other role. The docs (`docs/configuring-playbook-bridge-mautrix-wsproxy.md`) only talk about `matrix_mautrix_wsproxy_hostname`, which was only used via Traefik labels. The endpoint exposed via `matrix-nginx-proxy` (`/_matrix/wsproxy`) hasn't been mentioned anywhere.
This commit is contained in:
parent
8b28f8e122
commit
effca48288
@ -1,48 +0,0 @@
|
|||||||
---
|
|
||||||
|
|
||||||
- name: Fail if matrix-nginx-proxy role already executed
|
|
||||||
ansible.builtin.fail:
|
|
||||||
msg: >-
|
|
||||||
Trying to append Mautrix Wsproxy 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-bridge-mautrix-wsproxy role.
|
|
||||||
when: matrix_nginx_proxy_role_executed | default(False) | bool
|
|
||||||
|
|
||||||
- tags:
|
|
||||||
- always
|
|
||||||
when: matrix_mautrix_wsproxy_enabled|bool
|
|
||||||
block:
|
|
||||||
- name: Generate Mautrix Wsproxy proxying configuration for matrix-nginx-proxy
|
|
||||||
ansible.builtin.set_fact:
|
|
||||||
matrix_mautrix_wsproxy_matrix_nginx_proxy_configuration: |
|
|
||||||
location ~ ^/(_matrix/wsproxy/.*) {
|
|
||||||
{% 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-mautrix-wsproxy:29331";
|
|
||||||
proxy_pass http://$backend;
|
|
||||||
{% else %}
|
|
||||||
{# Generic configuration for use outside of our container setup #}
|
|
||||||
proxy_pass http://127.0.0.1:29331;
|
|
||||||
{% endif %}
|
|
||||||
}
|
|
||||||
|
|
||||||
- name: Register Mautrix Wsproxy 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_mautrix_wsproxy_matrix_nginx_proxy_configuration]
|
|
||||||
}}
|
|
||||||
|
|
||||||
- name: Warn about reverse-proxying if matrix-nginx-proxy not used
|
|
||||||
ansible.builtin.debug:
|
|
||||||
msg: >-
|
|
||||||
NOTE: You've enabled the Mautrix wsproxy bridge but are not using the matrix-nginx-proxy
|
|
||||||
reverse proxy.
|
|
||||||
Please make sure that you're proxying the `{{ matrix_mautrix_wsproxy_public_endpoint }}`
|
|
||||||
URL endpoint to the matrix-mautrix-wsproxy container.
|
|
||||||
You can expose the container's port using the `matrix_mautrix_wsproxy_container_http_host_bind_port` variable.
|
|
||||||
when: "matrix_mautrix_wsproxy_enabled|bool and matrix_nginx_proxy_enabled is not defined"
|
|
@ -1,14 +1,5 @@
|
|||||||
---
|
---
|
||||||
|
|
||||||
- tags:
|
|
||||||
- setup-all
|
|
||||||
- setup-nginx-proxy
|
|
||||||
- install-all
|
|
||||||
- install-nginx-proxy
|
|
||||||
block:
|
|
||||||
- when: matrix_mautrix_wsproxy_enabled | bool
|
|
||||||
ansible.builtin.include_tasks: "{{ role_path }}/tasks/inject_into_nginx_proxy.yml"
|
|
||||||
|
|
||||||
- tags:
|
- tags:
|
||||||
- setup-all
|
- setup-all
|
||||||
- setup-mautrix-wsproxy
|
- setup-mautrix-wsproxy
|
||||||
|
Loading…
Reference in New Issue
Block a user