X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/89b4f69cf22dcd7ff06a83a0d901fd4c446675e9..4722e0f97ac741783a6ed28fa49a5548295d64a0:/cookbooks/nominatim/templates/default/nginx.erb diff --git a/cookbooks/nominatim/templates/default/nginx.erb b/cookbooks/nominatim/templates/default/nginx.erb index f4eec183e..ddebe7c0b 100644 --- a/cookbooks/nominatim/templates/default/nginx.erb +++ b/cookbooks/nominatim/templates/default/nginx.erb @@ -69,7 +69,12 @@ geo $whitelisted { 2620:52:3:1:5054:ff:fe0a:75aa 1; # gnome } -map $missing_email$missing_referer$http_user_agent $blocked_user_agent { +map $server_protocol$http_user_agent $cleaned_user_agent { + default $http_user_agent; + "~^HTTP/1..Mozilla/" Script$http_user_agent; +} + +map $missing_email$missing_referer$cleaned_user_agent $blocked_user_agent { default 0; "11" 2; # block any requests without identifier include <%= @confdir %>/nginx_blocked_user_agent.conf; @@ -188,6 +193,9 @@ server { } location @php { + if ($forward_to_ui) { + rewrite ^(/[^/]*) https://$host/ui$1.html redirect; + } if ($blocked_user_agent ~ ^2$) { return 403; } if ($blocked_referrer) @@ -225,9 +233,6 @@ server { proxy_redirect off; proxy_pass http://nominatim_service; <% end -%> - if ($forward_to_ui) { - rewrite ^(/[^/]*) https://$host/ui$1.html redirect; - } } <% if node[:nominatim][:api_flavour] == "php" %>