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

-  server unix:/run/php/nominatim.openstreetmap.org.sock;
+<% 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;
+<% end -%>

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


@@ -57,7 +61,12 @@ geo $whitelisted {
     46.235.224.148 1;
     209.132.180.180 1;
     209.132.180.168 1;
     46.235.224.148 1;
     209.132.180.180 1;
     209.132.180.168 1;

-    8.43.85.23 1; # gnome
+    8.43.85.3 1; # gnome
+    8.43.85.4 1; # gnome
+    8.43.85.5 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

 }
 
 map $missing_email$missing_referer$http_user_agent $blocked_user_agent {
 }
 
 map $missing_email$missing_referer$http_user_agent $blocked_user_agent {


@@ -128,16 +137,16 @@ server {
 
 server {
     # IPv4
 
 server {
     # IPv4

-    listen       443 ssl deferred backlog=16384 reuseport http2 default_server;
+    listen       443 ssl http2 default_server;

     # IPv6
     # IPv6

-    listen       [::]:443 ssl deferred backlog=16384 reuseport http2 default_server;
+    listen       [::]:443 ssl http2 default_server;

     server_name  localhost;
 
     ssl_certificate /etc/ssl/certs/<%= node[:fqdn] %>.pem;
     ssl_certificate_key /etc/ssl/private/<%= node[:fqdn] %>.key;
 
     server_name  localhost;
 
     ssl_certificate /etc/ssl/certs/<%= node[:fqdn] %>.pem;
     ssl_certificate_key /etc/ssl/private/<%= node[:fqdn] %>.key;
 

-    root <%= @directory %>/website;
-    index search.php;
+    root <%= @directory %>/static-website;
+    index /search;

 
     access_log <%= node[:nominatim][:logdir] %>/nominatim.openstreetmap.org-access.log combined;
     error_log <%= node[:nominatim][:logdir] %>/nominatim.openstreetmap.org-error.log;
 
     access_log <%= node[:nominatim][:logdir] %>/nominatim.openstreetmap.org-access.log combined;
     error_log <%= node[:nominatim][:logdir] %>/nominatim.openstreetmap.org-error.log;


@@ -169,6 +178,15 @@ server {
         index search.html;
     }
 
         index search.html;
     }
 

+    location /qa-data/ {
+        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; }


@@ -182,16 +200,34 @@ 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_pass nominatim_service;
         include fastcgi_params;
         fastcgi_param QUERY_STRING    $args;
         fastcgi_param PATH_INFO       "$nominatim_path_info";

-        fastcgi_param SCRIPT_FILENAME  "$document_root/$nominatim_script_name";
+        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';
+          add_header 'Content-Length' 0;
+          add_header Access-Control-Allow-Origin "*" always;
+          add_header Access-Control-Allow-Methods 'GET,OPTIONS' always;
+          return 204;
+        }
+
+        proxy_set_header Host $http_host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_redirect off;
+        proxy_pass http://nominatim_service;
+<% end -%>

         if ($forward_to_ui) {
             rewrite ^(/[^/]*) https://$host/ui$1.html redirect;
         }
     }
 
         if ($forward_to_ui) {
             rewrite ^(/[^/]*) https://$host/ui$1.html redirect;
         }
     }
 

+<% if node[:nominatim][:api_flavour] == "php" %>

     location ~* \.php$ {
         if ($blocked_user_agent ~ ^2$)
         { return 403; }
     location ~* \.php$ {
         if ($blocked_user_agent ~ ^2$)
         { return 403; }


@@ -207,10 +243,11 @@ server {
         limit_req_status 429;
         fastcgi_pass    nominatim_service;
         include         fastcgi_params;
         limit_req_status 429;
         fastcgi_pass    nominatim_service;
         include         fastcgi_params;

-        fastcgi_param   SCRIPT_FILENAME    $document_root$fastcgi_script_name;
+        fastcgi_param   SCRIPT_FILENAME    <%= @directory %>/website/$fastcgi_script_name;

 
         if ($forward_to_ui) {
             rewrite (.*).php https://$host/ui$1.html redirect;
         }
     }
 
         if ($forward_to_ui) {
             rewrite (.*).php https://$host/ui$1.html redirect;
         }
     }

+<% end -%>

 }
 }