nominatim: add new dependency for updated osm2pgsql

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 67fce4feba65800a81e76a82616f972f37ef0549..9736f301a7b5aa4994c545967d16d9333969b4c5 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -121,6 +121,9 @@ end
 ## Nominatim backend
 
 include_recipe "git"
 ## Nominatim backend
 
 include_recipe "git"

+include_recipe "python"
+
+python_directory = "#{basedir}/venv"

 
 package %w[
   build-essential
 
 package %w[
   build-essential


@@ -136,6 +139,8 @@ package %w[
   libproj-dev
   liblua5.3-dev
   libluajit-5.1-dev
   libproj-dev
   liblua5.3-dev
   libluajit-5.1-dev

+  libicu-dev
+  nlohmann-json3-dev

   lua5.3
   python3-pyosmium
   python3-psycopg2
   lua5.3
   python3-pyosmium
   python3-psycopg2


@@ -148,6 +153,8 @@ package %w[
   python3-sqlalchemy-ext
   python3-geoalchemy2
   python3-asyncpg
   python3-sqlalchemy-ext
   python3-geoalchemy2
   python3-asyncpg

+  python3-dev
+  pkg-config

   ruby
   ruby-file-tail
   ruby-pg
   ruby
   ruby-file-tail
   ruby-pg


@@ -160,11 +167,55 @@ if node[:nominatim][:api_flavour] == "php"
     php-intl
   ]
 elsif node[:nominatim][:api_flavour] == "python"
     php-intl
   ]
 elsif node[:nominatim][:api_flavour] == "python"

-  package %w[
-    gunicorn
-    uvicorn
-    python3-starlette
-  ]
+
+  python_virtualenv python_directory do
+    interpreter "/usr/bin/python3"
+  end
+
+  python_package "SQLAlchemy" do
+    python_virtualenv python_directory
+    version "2.0.19"
+  end
+
+  python_package "PyICU" do
+    python_virtualenv python_directory
+    version "2.10.2"
+  end
+
+  python_package "psycopg[binary]" do
+    python_virtualenv python_directory
+    version "3.1.10"
+  end
+
+  python_package "psycopg2-binary" do
+    python_virtualenv python_directory
+    version "2.9.7"
+  end
+
+  python_package "python-dotenv" do
+    python_virtualenv python_directory
+    version "0.21.0"
+  end
+
+  python_package "PyYAML" do
+    python_virtualenv python_directory
+    version "6.0.1"
+  end
+
+  python_package "falcon" do
+    python_virtualenv python_directory
+    version "3.1.1"
+  end
+
+  python_package "uvicorn" do
+    python_virtualenv python_directory
+    version "0.23.2"
+  end
+
+  python_package "gunicorn" do
+    python_virtualenv python_directory
+    version "21.0.1"
+  end

 end
 
 source_directory = "#{basedir}/src/nominatim"
 end
 
 source_directory = "#{basedir}/src/nominatim"


@@ -258,7 +309,8 @@ template "#{project_directory}/.env" do
             :flatnode_file => node[:nominatim][:flatnode_file],
             :log_file => "#{node[:nominatim][:logdir]}/query.log",
             :tokenizer => node[:nominatim][:config][:tokenizer],
             :flatnode_file => node[:nominatim][:flatnode_file],
             :log_file => "#{node[:nominatim][:logdir]}/query.log",
             :tokenizer => node[:nominatim][:config][:tokenizer],

-            :forward_dependencies => node[:nominatim][:config][:forward_dependencies]
+            :forward_dependencies => node[:nominatim][:config][:forward_dependencies],
+            :pool_size => node[:nominatim][:api_pool_size]

 end
 
 remote_file "#{project_directory}/wikimedia-importance.sql.gz" do
 end
 
 remote_file "#{project_directory}/wikimedia-importance.sql.gz" do


@@ -311,7 +363,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 10 -k uvicorn.workers.UvicornWorker nominatim.server.starlette.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"
     exec_reload "/bin/kill -s HUP $MAINPID"
     environment :PYTHONPATH => "/usr/local/lib/nominatim/lib-python/"
     kill_mode "mixed"