]> git.openstreetmap.org Git - chef.git/blobdiff - cookbooks/nominatim/recipes/default.rb
build(deps): bump actions/checkout from 3 to 4
[chef.git] / cookbooks / nominatim / recipes / default.rb
index ffab40914d34be9304ca607ea2c3685aafbb2576..cb074845734a26bd5e55677cf343aaba4b4d5c11 100644 (file)
@@ -140,6 +140,7 @@ package %w[
   liblua5.3-dev
   libluajit-5.1-dev
   libicu-dev
+  nlohmann-json3-dev
   lua5.3
   python3-pyosmium
   python3-psycopg2
@@ -173,7 +174,7 @@ elsif node[:nominatim][:api_flavour] == "python"
 
   python_package "SQLAlchemy" do
     python_virtualenv python_directory
-    version "2.0.19"
+    version "2.0.20"
   end
 
   python_package "PyICU" do
@@ -196,6 +197,11 @@ elsif node[:nominatim][:api_flavour] == "python"
     version "0.21.0"
   end
 
+  python_package "pygments" do
+    python_virtualenv python_directory
+    version "2.16.1"
+  end
+
   python_package "PyYAML" do
     python_virtualenv python_directory
     version "6.0.1"
@@ -309,7 +315,9 @@ template "#{project_directory}/.env" do
             :log_file => "#{node[:nominatim][:logdir]}/query.log",
             :tokenizer => node[:nominatim][:config][:tokenizer],
             :forward_dependencies => node[:nominatim][:config][:forward_dependencies],
-            :pool_size => node[:nominatim][:api_pool_size]
+            :pool_size => node[:nominatim][:api_pool_size],
+            :query_timeout => node[:nominatim][:api_query_timeout],
+            :request_timeout => node[:nominatim][:api_request_timeout]
 end
 
 remote_file "#{project_directory}/wikimedia-importance.sql.gz" do
@@ -362,7 +370,7 @@ elsif node[:nominatim][:api_flavour] == "python"
     working_directory project_directory
     standard_output "append:#{node[:nominatim][:logdir]}/gunicorn.log"
     standard_error "inherit"
-    exec_start "#{python_directory}/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_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.server.falcon.server:run_wsgi"
     exec_reload "/bin/kill -s HUP $MAINPID"
     environment :PYTHONPATH => "/usr/local/lib/nominatim/lib-python/"
     kill_mode "mixed"