From: Sarah Hoffmann <lonvia@denofr.de>
Date: Thu, 18 Apr 2024 08:00:52 +0000 (+0200)
Subject: nominatim: UI forwarding should take precedence to blocking
X-Git-Url: https://git.openstreetmap.org/chef.git/commitdiff_plain/c9056ea38eb66e17eb2b467a4169691c68a28e2e

nominatim: UI forwarding should take precedence to blocking
---

diff --git a/cookbooks/nominatim/templates/default/nginx.erb b/cookbooks/nominatim/templates/default/nginx.erb
index f4eec183e..5e74bef73 100644
--- a/cookbooks/nominatim/templates/default/nginx.erb
+++ b/cookbooks/nominatim/templates/default/nginx.erb
@@ -188,6 +188,9 @@ server {
     }
 
     location @php {
+        if ($forward_to_ui) {
+            rewrite ^(/[^/]*) https://$host/ui$1.html redirect;
+        }
         if ($blocked_user_agent ~ ^2$)
         { return 403; }
         if ($blocked_referrer)
@@ -225,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" %>