nominatim: clamp down on rate limits

[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 ddebe7c0b70fdb1a32e00e23c6edc2a38d2b766a..af7ea960b3cc3799e17d25593dc942dfcd1a7915 100644 (file)
--- a/cookbooks/nominatim/templates/default/nginx.erb
+++ b/cookbooks/nominatim/templates/default/nginx.erb
@@ -1,9 +1,5 @@
 upstream nominatim_service {
 upstream nominatim_service {

-<% if node[:nominatim][:api_flavour] == "php" %>
-  server unix:/run/php/php-nominatim.openstreetmap.org-fpm.sock fail_timeout=0;
-<% elsif node[:nominatim][:api_flavour] == "python"  %>

   server unix:/run/gunicorn-nominatim.openstreetmap.org.sock fail_timeout=0;
   server unix:/run/gunicorn-nominatim.openstreetmap.org.sock fail_timeout=0;

-<% end -%>

 }
 
 map $uri $nominatim_script_name {
 }
 
 map $uri $nominatim_script_name {


@@ -67,6 +63,9 @@ geo $whitelisted {
     2620:52:3:1:5054:ff:fe0a:75a4 1; # gnome
     2620:52:3:1:5054:ff:fe0a:75a2 1; # gnome
     2620:52:3:1:5054:ff:fe0a:75aa 1; # gnome
     2620:52:3:1:5054:ff:fe0a:75a4 1; # gnome
     2620:52:3:1:5054:ff:fe0a:75a2 1; # gnome
     2620:52:3:1:5054:ff:fe0a:75aa 1; # gnome

+    34.234.151.67 1; # gnome - https://github.com/openstreetmap/operations/issues/1160
+    54.165.53.199 1; # gnome - https://github.com/openstreetmap/operations/issues/1160
+    35.153.15.118 1; # gnome - https://github.com/openstreetmap/operations/issues/1160

 }
 
 map $server_protocol$http_user_agent $cleaned_user_agent {
 }
 
 map $server_protocol$http_user_agent $cleaned_user_agent {


@@ -113,7 +112,7 @@ map $whitelisted$generic_mozilla$uri $limit_reverse {
     ~02/reverse.*  $binary_remote_addr;
 }
 
     ~02/reverse.*  $binary_remote_addr;
 }
 

-limit_req_zone $limit_www zone=www:50m rate=2r/s;
+limit_req_zone $limit_www zone=www:50m rate=1r/s;

 limit_req_zone $limit_tarpit zone=tarpit:10m rate=1r/s;
 limit_req_zone $binary_remote_addr zone=blocked:10m rate=20r/m;
 limit_req_zone $limit_reverse zone=reverse:10m rate=10r/m;
 limit_req_zone $limit_tarpit zone=tarpit:10m rate=1r/s;
 limit_req_zone $binary_remote_addr zone=blocked:10m rate=20r/m;
 limit_req_zone $limit_reverse zone=reverse:10m rate=10r/m;


@@ -210,13 +209,6 @@ server {
         limit_req zone=tarpit burst=5;
         limit_req zone=reverse burst=5;
         limit_req_status 429;
         limit_req zone=tarpit burst=5;
         limit_req zone=reverse burst=5;
         limit_req_status 429;

-<% if node[:nominatim][:api_flavour] == "php" %>
-        fastcgi_pass nominatim_service;
-        include fastcgi_params;
-        fastcgi_param QUERY_STRING    $args;
-        fastcgi_param PATH_INFO       "$nominatim_path_info";
-        fastcgi_param SCRIPT_FILENAME  "<%= @directory %>/website/$nominatim_script_name";
-<% elsif node[:nominatim][:api_flavour] == "python" %>

 
         if ($request_method = 'OPTIONS') {
           add_header 'Content-Type' 'text/plain; charset=UTF-8';
 
         if ($request_method = 'OPTIONS') {
           add_header 'Content-Type' 'text/plain; charset=UTF-8';


@@ -232,30 +224,5 @@ server {
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_redirect off;
         proxy_pass http://nominatim_service;
         proxy_set_header X-Forwarded-Proto $scheme;
         proxy_redirect off;
         proxy_pass http://nominatim_service;

-<% end -%>

     }
     }

-
-<% if node[:nominatim][:api_flavour] == "php" %>
-    location ~* \.php$ {
-        if ($blocked_user_agent ~ ^2$)
-        { return 403; }
-        if ($blocked_referrer)
-        { return 403; }
-        if ($blocked_email)
-        { return 403; }
-        include <%= @confdir %>/nginx_blocked_generic.conf;
-
-        limit_req zone=www burst=10;
-        limit_req zone=tarpit burst=2;
-        limit_req zone=reverse burst=5;
-        limit_req_status 429;
-        fastcgi_pass    nominatim_service;
-        include         fastcgi_params;
-        fastcgi_param   SCRIPT_FILENAME    <%= @directory %>/website/$fastcgi_script_name;
-
-        if ($forward_to_ui) {
-            rewrite (.*).php https://$host/ui$1.html redirect;
-        }
-    }
-<% end -%>

 }
 }