From effca48288b92ebfd6d5cf7a4fdfba75aabf4c5f Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Mon, 8 Jan 2024 09:19:24 +0200 Subject: [PATCH] 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. --- .../tasks/inject_into_nginx_proxy.yml | 48 ------------------- .../tasks/main.yml | 9 ---- 2 files changed, 57 deletions(-) delete mode 100644 roles/custom/matrix-bridge-mautrix-wsproxy/tasks/inject_into_nginx_proxy.yml diff --git a/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/inject_into_nginx_proxy.yml b/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/inject_into_nginx_proxy.yml deleted file mode 100644 index 9e30d7077..000000000 --- a/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/inject_into_nginx_proxy.yml +++ /dev/null @@ -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" diff --git a/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/main.yml b/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/main.yml index e41d555a2..77ba520f4 100644 --- a/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/main.yml +++ b/roles/custom/matrix-bridge-mautrix-wsproxy/tasks/main.yml @@ -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: - setup-all - setup-mautrix-wsproxy