From c650495c0e6b8e0bb7a779e75e392c6369dd9d2f Mon Sep 17 00:00:00 2001 From: Warrows Date: Fri, 30 Sep 2022 11:50:43 +0200 Subject: [PATCH 1/2] Update proxied nginx for maubot --- roles/matrix-bot-maubot/tasks/init.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/matrix-bot-maubot/tasks/init.yml b/roles/matrix-bot-maubot/tasks/init.yml index 461af0608..888d58d81 100644 --- a/roles/matrix-bot-maubot/tasks/init.yml +++ b/roles/matrix-bot-maubot/tasks/init.yml @@ -14,8 +14,9 @@ {% 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-bot-maubot:{{ matrix_bot_maubot_management_interface_port }}/$1"; + set $backend "matrix-bot-maubot:{{ matrix_bot_maubot_management_interface_port }}$request_uri"; proxy_pass http://$backend; + proxy_set_header Host $host; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; {% else %} From 936412a08e2335b81cc6fc33ffccf1e18c0df566 Mon Sep 17 00:00:00 2001 From: Warrows Date: Mon, 3 Oct 2022 14:25:30 +0200 Subject: [PATCH 2/2] Update proxied nginx for maubot - Don't put unnecessary Host header. - Update both cases (with or without nginx proxy) --- roles/matrix-bot-maubot/tasks/init.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/roles/matrix-bot-maubot/tasks/init.yml b/roles/matrix-bot-maubot/tasks/init.yml index 888d58d81..6d0210438 100644 --- a/roles/matrix-bot-maubot/tasks/init.yml +++ b/roles/matrix-bot-maubot/tasks/init.yml @@ -14,14 +14,13 @@ {% 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-bot-maubot:{{ matrix_bot_maubot_management_interface_port }}$request_uri"; - proxy_pass http://$backend; - proxy_set_header Host $host; + set $backend "matrix-bot-maubot:{{ matrix_bot_maubot_management_interface_port }}; + proxy_pass http://$backend$request_uri"; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; {% else %} {# Generic configuration for use outside of our container setup #} - proxy_pass http://127.0.0.1:{{ matrix_bot_maubot_management_interface_port }}/$1; + proxy_pass http://127.0.0.1:{{ matrix_bot_maubot_management_interface_port }}$request_uri"; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; {% endif %}