nominatim: improve IP query block expression

[chef.git] / cookbooks / nominatim / templates / default / nginx.erb

diff --git a/cookbooks/nominatim/templates/default/nginx.erb b/cookbooks/nominatim/templates/default/nginx.erb
index e15099c057a3de9ed2ed79cd7c9353fc9202742a..4f171bf06958e71427b9edcc508fc4a70a188b46 100644 (file)
--- 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;
@@ -199,9 +194,7 @@ server {
         { return 403; }
         if ($blocked_email)
         { return 403; }
-        if ($blocked_path)
-        { return 403; }
-        if ($args ~* "q=[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+[ &]")
+        if ($arg_q ~* "^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$")
         { return 418; }
         include <%= @confdir %>/nginx_blocked_generic.conf;