X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/aac9019ca9345582b8debfb8c4f3db8f55c3b648..5607e6ceec58c6b18840b1a7602694b2f8c5e9f2:/cookbooks/nominatim/templates/default/nginx.erb?ds=inline diff --git a/cookbooks/nominatim/templates/default/nginx.erb b/cookbooks/nominatim/templates/default/nginx.erb index a18a06664..5e74bef73 100644 --- a/cookbooks/nominatim/templates/default/nginx.erb +++ b/cookbooks/nominatim/templates/default/nginx.erb @@ -7,9 +7,9 @@ upstream nominatim_service { } map $uri $nominatim_script_name { - ~^(.+?\.php) $1; - ~^/([^/]+) $1.php; - ^$ search.php; + ~^/*(.+?)\.php $1; + ~^/*([^/]+) $1; + ^$ search; } map $uri $nominatim_path_info { @@ -182,13 +182,23 @@ server { add_header Access-Control-Allow-Origin "*" always; } + location ~* ^/(search|reverse)(\.php)?/ { + error_page 404 /404-old-search-syntax.html; + return 404; + } + 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 ($args ~* "q=[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+[ &]") + { return 418; } include <%= @confdir %>/nginx_blocked_generic.conf; limit_req zone=www burst=10; @@ -204,10 +214,11 @@ server { <% elsif node[:nominatim][:api_flavour] == "python" %> if ($request_method = 'OPTIONS') { - add_header 'Content-Type' 'text/plain charset=UTF-8'; + add_header 'Content-Type' 'text/plain; charset=UTF-8'; add_header 'Content-Length' 0; - add_header Access-Control-Allow-Origin "*" always; - add_header Access-Control-Allow-Methods 'GET,OPTIONS' always; + add_header Access-Control-Allow-Origin "*"; + add_header Access-Control-Allow-Methods 'GET,OPTIONS'; + add_header Access-Control-Allow-Headers $http_access_control_request_headers; return 204; } @@ -217,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" %>