Really set a limit on expiring long way segments

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

diff --git a/cookbooks/nominatim/attributes/default.rb b/cookbooks/nominatim/attributes/default.rb
index def731605ba2ea4691fc11585cb304950b934b83..ad9dffae5e54c98f8d12cc9ff06f28bc653b8990 100644 (file)
--- a/cookbooks/nominatim/attributes/default.rb
+++ b/cookbooks/nominatim/attributes/default.rb
@@ -6,7 +6,7 @@ default[:nominatim][:tablespaces] = []
 default[:nominatim][:postgis] = "3"
 default[:nominatim][:logdir] = "/var/log/nominatim"
 default[:nominatim][:repository] = "https://git.openstreetmap.org/public/nominatim.git"
 default[:nominatim][:postgis] = "3"
 default[:nominatim][:logdir] = "/var/log/nominatim"
 default[:nominatim][:repository] = "https://git.openstreetmap.org/public/nominatim.git"

-default[:nominatim][:revision] = "master"
+default[:nominatim][:revision] = "deploy"

 default[:nominatim][:enable_backup] = false
 default[:nominatim][:enable_git_updates] = true
 default[:nominatim][:enable_qa_tiles] = false
 default[:nominatim][:enable_backup] = false
 default[:nominatim][:enable_git_updates] = true
 default[:nominatim][:enable_qa_tiles] = false


@@ -16,7 +16,9 @@ default[:nominatim][:qa_repository] = "https://github.com/osm-search/Nominatim-D
 default[:nominatim][:qa_revision] = "main"
 default[:nominatim][:api_flavour] = "php"
 default[:nominatim][:api_workers] = 10
 default[:nominatim][:qa_revision] = "main"
 default[:nominatim][:api_flavour] = "php"
 default[:nominatim][:api_workers] = 10

-default[:nominatim][:api_pool_size] = 20
+default[:nominatim][:api_pool_size] = 10
+default[:nominatim][:api_query_timeout] = 5
+default[:nominatim][:api_request_timeout] = 20

 
 default[:nominatim][:fpm_pools] = {
   "nominatim.openstreetmap.org" => {
 
 default[:nominatim][:fpm_pools] = {
   "nominatim.openstreetmap.org" => {