Drop references to OAuth 1 tables

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 14b2b6628d854f30f3146144898a506c190a0011..1d0ffe44ab23073cd3ee9968626335e7fe1f44a6 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -18,7 +18,6 @@
 #
 
 include_recipe "accounts"
-include_recipe "munin"
 include_recipe "prometheus"
 
 if node[:nominatim][:api_flavour] == "php"
@@ -169,17 +168,17 @@ elsif node[:nominatim][:api_flavour] == "python"
 
   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
-    version "2.12"
+    version "2.13.1"
   end
 
   python_package "psycopg[binary]" do
     python_virtualenv python_directory
-    version "3.1.13"
+    version "3.2.1"
   end
 
   python_package "psycopg2-binary" do
@@ -189,32 +188,52 @@ elsif node[:nominatim][:api_flavour] == "python"
 
   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
-    version "2.17.2"
+    version "2.18.0"
   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
-    version "3.1.1"
+    version "3.1.3"
   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
-    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
 
@@ -315,6 +334,14 @@ template "#{project_directory}/.env" do
             :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"