Drop role for gorwen

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 2fc9191a6031d52985470dae5ca919f96569c9db..d8440761a08a5513ced2497b04ab41597a755046 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -168,17 +168,17 @@ elsif node[:nominatim][:api_flavour] == "python"
 
   python_package "SQLAlchemy" do
     python_virtualenv python_directory
 
   python_package "SQLAlchemy" do
     python_virtualenv python_directory

-    version "2.0.23"
+    version "2.0.32"

   end
 
   python_package "PyICU" do
     python_virtualenv python_directory
   end
 
   python_package "PyICU" do
     python_virtualenv python_directory

-    version "2.12"
+    version "2.13.1"

   end
 
   python_package "psycopg[binary]" do
     python_virtualenv python_directory
   end
 
   python_package "psycopg[binary]" do
     python_virtualenv python_directory

-    version "3.1.13"
+    version "3.2.1"

   end
 
   python_package "psycopg2-binary" do
   end
 
   python_package "psycopg2-binary" do


@@ -188,32 +188,52 @@ elsif node[:nominatim][:api_flavour] == "python"
 
   python_package "python-dotenv" do
     python_virtualenv python_directory
 
   python_package "python-dotenv" do
     python_virtualenv python_directory

-    version "0.21.0"
+    version "1.0.1"

   end
 
   python_package "pygments" do
     python_virtualenv python_directory
   end
 
   python_package "pygments" do
     python_virtualenv python_directory

-    version "2.17.2"
+    version "2.18.0"

   end
 
   python_package "PyYAML" do
     python_virtualenv python_directory
   end
 
   python_package "PyYAML" do
     python_virtualenv python_directory

-    version "6.0.1"
+    version "6.0.2"

   end
 
   python_package "falcon" do
     python_virtualenv python_directory
   end
 
   python_package "falcon" do
     python_virtualenv python_directory

-    version "3.1.1"
+    version "3.1.3"

   end
 
   python_package "uvicorn" do
     python_virtualenv python_directory
   end
 
   python_package "uvicorn" do
     python_virtualenv python_directory

-    version "0.24.0.post1"
+    version "0.30.5"

   end
 
   python_package "gunicorn" do
     python_virtualenv python_directory
   end
 
   python_package "gunicorn" do
     python_virtualenv python_directory

-    version "21.0.1"
+    version "22.0.0"
+  end
+
+  python_package "jinja2" do
+    python_virtualenv python_directory
+    version "3.1.4"
+  end
+
+  python_package "datrie" do
+    python_virtualenv python_directory
+    version "0.8.2"
+  end
+
+  python_package "psutil" do
+    python_virtualenv python_directory
+    version "6.0.0"
+  end
+
+  python_package "osmium" do
+    python_virtualenv python_directory
+    version "3.7.0"

   end
 end
 
   end
 end
 


@@ -314,6 +334,14 @@ template "#{project_directory}/.env" do
             :request_timeout => node[:nominatim][:api_request_timeout]
 end
 
             :request_timeout => node[:nominatim][:api_request_timeout]
 end
 

+remote_file "#{project_directory}/secondary_importance.sql.gz" do
+  action :create_if_missing
+  source "https://nominatim.org/data/wikimedia-secondary-importance.sql.gz"
+  owner "nominatim"
+  group "nominatim"
+  mode "644"
+end
+

 remote_file "#{project_directory}/wikimedia-importance.sql.gz" do
   action :create_if_missing
   source "https://nominatim.org/data/wikimedia-importance.sql.gz"
 remote_file "#{project_directory}/wikimedia-importance.sql.gz" do
   action :create_if_missing
   source "https://nominatim.org/data/wikimedia-importance.sql.gz"


@@ -364,7 +392,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 "#{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_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_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"