X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/683aff351010f9bcfc7154ecb0ca91e0c0e0591c..5607e6ceec58c6b18840b1a7602694b2f8c5e9f2:/cookbooks/nominatim/templates/default/nginx.erb diff --git a/cookbooks/nominatim/templates/default/nginx.erb b/cookbooks/nominatim/templates/default/nginx.erb index 6aa07dbe1..5e74bef73 100644 --- a/cookbooks/nominatim/templates/default/nginx.erb +++ b/cookbooks/nominatim/templates/default/nginx.erb @@ -85,11 +85,6 @@ map $missing_referer$missing_ua$email_id $blocked_email { include <%= @confdir %>/nginx_blocked_email.conf; } -map $nominatim_script_name$missing_referer $blocked_path { - default 0; - "details1" 1; -} - map $whitelisted $limit_www { 1 ""; 0 $binary_remote_addr; @@ -193,14 +188,17 @@ server { } location @php { + if ($forward_to_ui) { + rewrite ^(/[^/]*) https://$host/ui$1.html redirect; + } if ($blocked_user_agent ~ ^2$) { return 403; } if ($blocked_referrer) { return 403; } if ($blocked_email) { return 403; } - if ($blocked_path) - { return 403; } + if ($args ~* "q=[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+[ &]") + { return 418; } include <%= @confdir %>/nginx_blocked_generic.conf; limit_req zone=www burst=10; @@ -230,9 +228,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" %>