nominatim: blocks need to go into the php locations

diff --git a/cookbooks/nominatim/templates/default/nginx.erb b/cookbooks/nominatim/templates/default/nginx.erb
index fd4ed93fad36f8e103d358012feec1ba7babd77f..4596d65e95fbfbec6f8592990f786360a1d94f21 100644 (file)
--- a/cookbooks/nominatim/templates/default/nginx.erb
+++ b/cookbooks/nominatim/templates/default/nginx.erb
@@ -133,6 +133,10 @@ server {
     }
 
     location / {
     }
 
     location / {

+        try_files $uri $uri/ @php;
+    }
+
+    location @php {

         if ($blocked_user_agent ~ ^2$)
         { return 403; }
         if ($blocked_referrer)
         if ($blocked_user_agent ~ ^2$)
         { return 403; }
         if ($blocked_referrer)


@@ -140,10 +144,6 @@ server {
         if ($blocked_email)
         { return 403; }
 
         if ($blocked_email)
         { return 403; }
 

-        try_files $uri $uri/ @php;
-    }
-
-    location @php {

         limit_req zone=www burst=10;
         limit_req zone=tarpit burst=2;
         limit_req_status 429;
         limit_req zone=www burst=10;
         limit_req zone=tarpit burst=2;
         limit_req_status 429;


@@ -155,6 +155,13 @@ server {
     }
 
     location ~* \.php$ {
     }
 
     location ~* \.php$ {

+        if ($blocked_user_agent ~ ^2$)
+        { return 403; }
+        if ($blocked_referrer)
+        { return 403; }
+        if ($blocked_email)
+        { return 403; }
+

         limit_req zone=www burst=10;
         limit_req zone=tarpit burst=2;
         limit_req_status 429;
         limit_req zone=www burst=10;
         limit_req zone=tarpit burst=2;
         limit_req_status 429;