| @@ -44,15 +44,14 @@ | |||||
| - name: Generate Matrix Appservice webhooks proxying configuration for matrix-nginx-proxy | - name: Generate Matrix Appservice webhooks proxying configuration for matrix-nginx-proxy | ||||
| set_fact: | set_fact: | ||||
| matrix_appservice_webhooks_matrix_nginx_proxy_configuration: | | matrix_appservice_webhooks_matrix_nginx_proxy_configuration: | | ||||
| location {{ matrix_appservice_webhooks_public_endpoint }} { | |||||
| location {{ matrix_appservice_webhooks_public_endpoint }}/ { | |||||
| {% 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; | ||||
| rewrite {{ matrix_appservice_webhooks_public_endpoint }}/(.*) /$1 break; | |||||
| proxy_pass {{ matrix_appservice_webhooks_appservice_url }}:{{ matrix_appservice_webhooks_matrix_port }}; | |||||
| proxy_pass {{ matrix_appservice_webhooks_appservice_url }}:{{ matrix_appservice_webhooks_matrix_port }}/; | |||||
| {% 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_appservice_webhooks_matrix_port }}; | |||||
| proxy_pass http://127.0.0.1:{{ matrix_appservice_webhooks_matrix_port }}/; | |||||
| {% endif %} | {% endif %} | ||||
| } | } | ||||