Merge remote-tracking branch 'github/pull/827'

Author: tomhughes

cookbooks/dev/templates/default/apache.rails.erb

@@ -43,7 +43,7 @@
         RewriteEngine on
         RewriteRule ^/api/0\.6/map(\.json|\.xml)?$ unix:<%= @cgimap_socket %>|fcgi://127.0.0.1$0 [P]
         RewriteCond %{REQUEST_METHOD} ^(HEAD|GET)$
-        RewriteRule ^/api/0\.6/(node|way|relation|changeset)/[0-9]+(\.json|\.xml)?$ unix:<%= @cgimap_socket %>|fcgi://127.0.0.1$0 [P]
+        RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+(\.json|\.xml)?$ unix:<%= @cgimap_socket %>|fcgi://127.0.0.1$0 [P]
         RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+/history(\.json|\.xml)?$ unix:<%= @cgimap_socket %>|fcgi://127.0.0.1$0 [P]
         RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+/relations(\.json|\.xml)?$ unix:<%= @cgimap_socket %>|fcgi://127.0.0.1$0 [P]
         RewriteRule ^/api/0\.6/node/[0-9]+/ways(\.json|\.xml)?$ unix:<%= @cgimap_socket %>|fcgi://127.0.0.1$0 [P]

cookbooks/dns/recipes/default.rb

@@ -42,7 +42,7 @@
 
 cache_dir = Chef::Config[:file_cache_path]
 
-dnscontrol_version = "4.32.0"
+dnscontrol_version = "4.33.0"
 
 dnscontrol_arch = if arm?
                     "arm64"

cookbooks/nominatim/recipes/default.rb

@@ -198,7 +198,7 @@
   working_directory project_directory
   standard_output "append:#{node[:nominatim][:logdir]}/gunicorn.log"
   standard_error "inherit"
-  exec_start "#{python_directory}/bin/gunicorn --max-requests 200000 -b unix:/run/gunicorn-nominatim.openstreetmap.org.sock -w #{node[:nominatim][:api_workers]} -k uvicorn.workers.UvicornWorker 'nominatim_api.server.falcon.server:run_wsgi()'"
+  exec_start "#{python_directory}/bin/gunicorn --max-requests 500000 -b unix:/run/gunicorn-nominatim.openstreetmap.org.sock -w #{node[:nominatim][:api_workers]} --worker-class asgi --worker-connections 1000 --protocol uwsgi 'nominatim_api.server.falcon.server:run_wsgi()'"
   exec_reload "/bin/kill -s HUP $MAINPID"
   kill_mode "mixed"
   timeout_stop_sec 5

cookbooks/nominatim/templates/default/nginx.erb

@@ -223,12 +223,8 @@ server {
           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_set_header Proxy-Connection "";
-        proxy_redirect off;
-        proxy_pass http://nominatim_service;
+        uwsgi_pass nominatim_service;
+        include uwsgi_params;
 
         add_header Vary "accept-language";
     }

cookbooks/prometheus/recipes/server.rb

@@ -71,7 +71,7 @@
 cache_dir = Chef::Config[:file_cache_path]
 
 prometheus_version = "3.9.1"
-alertmanager_version = "0.30.0"
+alertmanager_version = "0.31.0"
 karma_version = "0.122"
 
 directory "/opt/prometheus-server" do

cookbooks/prometheus/templates/default/alert_rules.yml.erb

@@ -558,7 +558,7 @@ groups:
   - name: nominatim
     rules:
       - alert: nominatim replication delay
-        expr: nominatim_replication_delay > 14400
+        expr: nominatim_replication_delay > 18000
         for: 1h
         keep_firing_for: 30m
         labels:

cookbooks/web/templates/default/apache.frontend.erb

@@ -209,7 +209,7 @@ ErrorLog /var/log/apache2/error.log
   #
   RewriteRule ^/api/0\.6/map(\.json|\.xml)?$ unix:/run/cgimap/socket|fcgi://127.0.0.1$0 [P]
   RewriteCond %{REQUEST_METHOD} ^(HEAD|GET)$
-  RewriteRule ^/api/0\.6/(node|way|relation|changeset)/[0-9]+(\.json|\.xml)?$ unix:/run/cgimap/socket|fcgi://127.0.0.1$0 [P]
+  RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+(\.json|\.xml)?$ unix:/run/cgimap/socket|fcgi://127.0.0.1$0 [P]
   RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+/history(\.json|\.xml)?$ unix:/run/cgimap/socket|fcgi://127.0.0.1$0 [P]
   RewriteRule ^/api/0\.6/(node|way|relation)/[0-9]+/relations(\.json|\.xml)?$ unix:/run/cgimap/socket|fcgi://127.0.0.1$0 [P]
   RewriteRule ^/api/0\.6/node/[0-9]+/ways(\.json|\.xml)?$ unix:/run/cgimap/socket|fcgi://127.0.0.1$0 [P]

roles/angor.rb

@@ -34,5 +34,6 @@
 )
 
 run_list(
-  "role[inxza]"
+  "role[inxza]",
+  "recipe[atlas]"
 )

roles/azure-01.rb

@@ -157,5 +157,6 @@
 
 run_list(
   "role[twds]",
-  "role[tile]"
+  "role[tile]",
+  "recipe[atlas]"
 )

roles/nidhogg.rb

@@ -55,5 +55,6 @@
 
 run_list(
   "role[umu]",
-  "role[tile]"
+  "role[tile]",
+  "recipe[atlas]"
 )