nominatim: make forward dependencies configurable

[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..6f355dd11bf73fefdc0cb90e6bbd6a5037411a3e 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 unix:/run/php/nominatim.openstreetmap.org.sock;
+  server unix:/run/php/php-nominatim.openstreetmap.org-fpm.sock;

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


@@ -57,7 +57,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,9 +133,9 @@ 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;
     server_name  localhost;
 
     ssl_certificate /etc/ssl/certs/<%= node[:fqdn] %>.pem;


@@ -169,6 +174,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; }