Revert "Allow domain level blocks on email senders"

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

diff --git a/cookbooks/nominatim/recipes/default.rb b/cookbooks/nominatim/recipes/default.rb
index 9736f301a7b5aa4994c545967d16d9333969b4c5..cb074845734a26bd5e55677cf343aaba4b4d5c11 100644 (file)
--- a/cookbooks/nominatim/recipes/default.rb
+++ b/cookbooks/nominatim/recipes/default.rb
@@ -174,7 +174,7 @@ 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.19"
+    version "2.0.20"

   end
 
   python_package "PyICU" do
   end
 
   python_package "PyICU" do


@@ -197,6 +197,11 @@ elsif node[:nominatim][:api_flavour] == "python"
     version "0.21.0"
   end
 
     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"
   python_package "PyYAML" do
     python_virtualenv python_directory
     version "6.0.1"


@@ -310,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],
             :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
 end
 
 remote_file "#{project_directory}/wikimedia-importance.sql.gz" do