nominatim: disable luajit

[chef.git] / cookbooks / nominatim / recipes / default.rb

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 90c58445b12adc6a7abb11568e0607ef045bebde..bf0db0aecd9a26067f04b96af04dcbb34871f42c 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -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,22 +174,22 @@ elsif node[:nominatim][:api_flavour] == "python"
 
   python_package "SQLAlchemy" do
     python_virtualenv python_directory
-    version "2.0.19"
+    version "2.0.23"
   end
 
   python_package "PyICU" do
     python_virtualenv python_directory
-    version "2.10.2"
+    version "2.12"
   end
 
   python_package "psycopg[binary]" do
     python_virtualenv python_directory
-    version "3.1.10"
+    version "3.1.13"
   end
 
   python_package "psycopg2-binary" do
     python_virtualenv python_directory
-    version "2.9.7"
+    version "2.9.9"
   end
 
   python_package "python-dotenv" 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.17.2"
+  end
+
   python_package "PyYAML" do
     python_virtualenv python_directory
     version "6.0.1"
@@ -208,7 +214,7 @@ elsif node[:nominatim][:api_flavour] == "python"
 
   python_package "uvicorn" do
     python_virtualenv python_directory
-    version "0.23.2"
+    version "0.24.0.post1"
   end
 
   python_package "gunicorn" do
@@ -286,7 +292,7 @@ execute "compile_nominatim" do
   action :nothing
   user "nominatim"
   cwd build_directory
-  command "cmake -D WITH_LUAJIT=ON #{source_directory} && make"
+  command "cmake #{source_directory} && make"
   notifies :run, "execute[install_nominatim]"
 end
 
@@ -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