mirror/matrix-docker-ansible-deploy
1
0
Fork 0
mirror of https://github.com/spantaleev/matrix-docker-ansible-deploy.git synced 2025-01-23 00:14:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Prevent certain nginx location blocks from being ignored

Browse Source 
The regex introduced in 63a49bb2dc778 seems to take precedence
over the bare location blocks, causing a regression.

> It is important to understand that, by default, Nginx will serve regular expression matches in preference to prefix matches.
> However, it evaluates prefix locations first, allowing for the administer to override this tendency by specifying locations using the = and ^~ modifiers.

Source: https://www.digitalocean.com/community/tutorials/understanding-nginx-server-and-location-block-selection-algorithms
This commit is contained in:
Slavi Pantaleev 2020-10-28 09:38:04 +02:00
parent 67d0f26463
commit ef07aa8e5d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/matrix-nginx-proxy/templates/nginx/conf.d/matrix-synapse.conf.j2
View File

@ -34,7 +34,7 @@
{% endif %} {% endif %}
{% if matrix_nginx_proxy_proxy_matrix_corporal_api_enabled %} {% if matrix_nginx_proxy_proxy_matrix_corporal_api_enabled %}
location /_matrix/corporal { location ^~ /_matrix/corporal {
{% if matrix_nginx_proxy_enabled %} {% if matrix_nginx_proxy_enabled %}
{# 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;
@ -51,7 +51,7 @@
{% endif %} {% endif %}
{% if matrix_nginx_proxy_proxy_matrix_identity_api_enabled %} {% if matrix_nginx_proxy_proxy_matrix_identity_api_enabled %}
location /_matrix/identity { location ^~ /_matrix/identity {
{% if matrix_nginx_proxy_enabled %} {% if matrix_nginx_proxy_enabled %}
{# 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;
@ -68,7 +68,7 @@
{% endif %} {% endif %}
{% if matrix_nginx_proxy_proxy_matrix_user_directory_search_enabled %} {% if matrix_nginx_proxy_proxy_matrix_user_directory_search_enabled %}
location /_matrix/client/r0/user_directory/search { location ^~ /_matrix/client/r0/user_directory/search {
{% if matrix_nginx_proxy_enabled %} {% if matrix_nginx_proxy_enabled %}
{# 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;