| @@ -54,17 +54,17 @@ | |||||
| - name: Generate Maubot proxying configuration for matrix-nginx-proxy | - name: Generate Maubot proxying configuration for matrix-nginx-proxy | ||||
| set_fact: | set_fact: | ||||
| matrix_bot_maubot_matrix_nginx_proxy_configuration: | | matrix_bot_maubot_matrix_nginx_proxy_configuration: | | ||||
| location /_matrix/maubot { | |||||
| location ~ ^/(_matrix/maubot/.*) { | |||||
| {% if matrix_nginx_proxy_enabled|default(False) %} | {% if matrix_nginx_proxy_enabled|default(False) %} | ||||
| {# Use the embedded DNS resolver in Docker containers to discover the service #} | {# Use the embedded DNS resolver in Docker containers to discover the service #} | ||||
| resolver 127.0.0.11 valid=5s; | resolver 127.0.0.11 valid=5s; | ||||
| set $backend "matrix-maubot:{{ matrix_bot_maubot_management_port }}"; | |||||
| set $backend "matrix-maubot:{{ matrix_bot_maubot_management_port }}/$1"; | |||||
| proxy_pass http://$backend; | proxy_pass http://$backend; | ||||
| proxy_set_header Upgrade $http_upgrade; | proxy_set_header Upgrade $http_upgrade; | ||||
| proxy_set_header Connection "upgrade"; | proxy_set_header Connection "upgrade"; | ||||
| {% else %} | {% else %} | ||||
| {# Generic configuration for use outside of our container setup #} | {# Generic configuration for use outside of our container setup #} | ||||
| proxy_pass http://127.0.0.1:{{ matrix_bot_maubot_management_port }}; | |||||
| proxy_pass http://127.0.0.1:{{ matrix_bot_maubot_management_port }}/$1; | |||||
| proxy_set_header Upgrade $http_upgrade; | proxy_set_header Upgrade $http_upgrade; | ||||
| proxy_set_header Connection "upgrade"; | proxy_set_header Connection "upgrade"; | ||||
| {% endif %} | {% endif %} | ||||