]> git.openstreetmap.org Git - chef.git/commitdiff
nominatim: switch frontend from starlette to falcon
authorSarah Hoffmann <lonvia@denofr.de>
Tue, 1 Aug 2023 15:58:40 +0000 (17:58 +0200)
committerSarah Hoffmann <lonvia@denofr.de>
Tue, 1 Aug 2023 15:58:40 +0000 (17:58 +0200)
The starlette version that ships with Ubunutu is too old.

cookbooks/nominatim/recipes/default.rb

index 562de9a09657807837b12c70bedb07e4a2776e24..304e6c15611b9508f3119205cdf602647b06b6b8 100644 (file)
@@ -163,7 +163,7 @@ elsif node[:nominatim][:api_flavour] == "python"
   package %w[
     gunicorn
     uvicorn
   package %w[
     gunicorn
     uvicorn
-    python3-starlette
+    python3-falcon
   ]
 end
 
   ]
 end
 
@@ -312,7 +312,7 @@ elsif node[:nominatim][:api_flavour] == "python"
     working_directory project_directory
     standard_output "append:#{node[:nominatim][:logdir]}/gunicorn.log"
     standard_error "inherit"
     working_directory project_directory
     standard_output "append:#{node[:nominatim][:logdir]}/gunicorn.log"
     standard_error "inherit"
-    exec_start "/usr/bin/gunicorn -b unix:/run/gunicorn-nominatim.openstreetmap.org.sock -w #{node[:nominatim][:api_workers]} -k uvicorn.workers.UvicornWorker nominatim.server.starlette.server:run_wsgi"
+    exec_start "/usr/bin/gunicorn -b unix:/run/gunicorn-nominatim.openstreetmap.org.sock -w #{node[:nominatim][:api_workers]} -k uvicorn.workers.UvicornWorker nominatim.server.falcon.server:run_wsgi"
     exec_reload "/bin/kill -s HUP $MAINPID"
     environment :PYTHONPATH => "/usr/local/lib/nominatim/lib-python/"
     kill_mode "mixed"
     exec_reload "/bin/kill -s HUP $MAINPID"
     environment :PYTHONPATH => "/usr/local/lib/nominatim/lib-python/"
     kill_mode "mixed"