Update board wiki to 1.37

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

-  server 127.0.0.1:<%= @pools[:www][:port ]%>;
+  server unix:/run/php/nominatim.openstreetmap.org.sock;

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


@@ -24,6 +24,7 @@ map $uri/$format $forward_to_ui {
     ~/other$              0;
     ~/reverse.*/default   0;
     ~/lookup.*/default    0;
     ~/other$              0;
     ~/reverse.*/default   0;
     ~/lookup.*/default    0;

+    ~/status.*/default    0;

 }
 
 map $query_string $email_id {
 }
 
 map $query_string $email_id {


@@ -168,6 +169,10 @@ server {
         index search.html;
     }
 
         index search.html;
     }
 

+    location /qa-data/ {
+        add_header Access-Control-Allow-Origin "*" always;
+    }
+

     location @php {
         if ($blocked_user_agent ~ ^2$)
         { return 403; }
     location @php {
         if ($blocked_user_agent ~ ^2$)
         { return 403; }


@@ -178,7 +183,7 @@ server {
         include <%= @confdir %>/nginx_blocked_generic.conf;
 
         limit_req zone=www burst=10;
         include <%= @confdir %>/nginx_blocked_generic.conf;
 
         limit_req zone=www burst=10;

-        limit_req zone=tarpit burst=2;
+        limit_req zone=tarpit burst=5;

         limit_req zone=reverse burst=5;
         limit_req_status 429;
         fastcgi_pass nominatim_service;
         limit_req zone=reverse burst=5;
         limit_req_status 429;
         fastcgi_pass nominatim_service;