nominatim: fix logrotate config syntax

[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 a18a0666465fe1217cce52a40bd9ff4ffe32552b..def54f1ace9a6414dff411bdaee36dba1e61abb7 100644 (file)
--- a/cookbooks/nominatim/templates/default/nginx.erb
+++ b/cookbooks/nominatim/templates/default/nginx.erb
@@ -182,6 +182,11 @@ server {
         add_header Access-Control-Allow-Origin "*" always;
     }
 
         add_header Access-Control-Allow-Origin "*" always;
     }
 

+    location ~* ^/(search|reverse)(\.php)?/ {
+        error_page 404 /404-old-search-syntax.html;
+        return 404;
+    }
+

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


@@ -204,7 +209,7 @@ server {
 <% elsif node[:nominatim][:api_flavour] == "python" %>
 
         if ($request_method = 'OPTIONS') {
 <% elsif node[:nominatim][:api_flavour] == "python" %>
 
         if ($request_method = 'OPTIONS') {

-          add_header 'Content-Type' 'text/plain charset=UTF-8';
+          add_header 'Content-Type' 'text/plain; charset=UTF-8';

           add_header 'Content-Length' 0;
           add_header Access-Control-Allow-Origin "*" always;
           add_header Access-Control-Allow-Methods 'GET,OPTIONS' always;
           add_header 'Content-Length' 0;
           add_header Access-Control-Allow-Origin "*" always;
           add_header Access-Control-Allow-Methods 'GET,OPTIONS' always;