Use backport of cgi-mapserver

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

diff --git a/cookbooks/nominatim/attributes/default.rb b/cookbooks/nominatim/attributes/default.rb
index 1edb544d280dc63ccbdfaae5e9bb0f8195f96469..1b82d5f797a86308559b7ff0f1739bc081ca834c 100644 (file)
--- a/cookbooks/nominatim/attributes/default.rb
+++ b/cookbooks/nominatim/attributes/default.rb
@@ -1,38 +1,23 @@
-default[:nominatim][:state] = "off" # or: standalone, master, slave

 default[:nominatim][:dbadmins] = []
 default[:nominatim][:dbcluster] = "14/main"
 default[:nominatim][:dbname] = "nominatim"
 default[:nominatim][:dbadmins] = []
 default[:nominatim][:dbcluster] = "14/main"
 default[:nominatim][:dbname] = "nominatim"

-default[:nominatim][:tablespaces] = []

 default[:nominatim][:postgis] = "3"
 default[:nominatim][:logdir] = "/var/log/nominatim"
 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][:enable_backup] = false
-default[:nominatim][:enable_git_updates] = true
+default[:nominatim][:pip_index] = "https://nominatim.org/data/osm-production"

 default[:nominatim][:enable_qa_tiles] = false
 default[:nominatim][:ui_repository] = "https://git.openstreetmap.org/public/nominatim-ui.git"
 default[:nominatim][:ui_revision] = "master"
 default[:nominatim][:qa_repository] = "https://github.com/osm-search/Nominatim-Data-Analyser"
 default[:nominatim][:enable_qa_tiles] = false
 default[:nominatim][:ui_repository] = "https://git.openstreetmap.org/public/nominatim-ui.git"
 default[:nominatim][:ui_revision] = "master"
 default[:nominatim][:qa_repository] = "https://github.com/osm-search/Nominatim-Data-Analyser"

-default[:nominatim][:qa_revision] = "main"
-default[:nominatim][:api_flavour] = "php"
+default[:nominatim][:qa_revision] = "deploy"

 default[:nominatim][:api_workers] = 10
 default[:nominatim][:api_pool_size] = 10
 default[:nominatim][:api_workers] = 10
 default[:nominatim][:api_pool_size] = 10

-
-default[:nominatim][:fpm_pools] = {
-  "nominatim.openstreetmap.org" => {
-    :pm => "dynamic",
-    :max_children => 60,
-    :prometheus_port => 9253
-  }
-}
+default[:nominatim][:api_query_timeout] = 5
+default[:nominatim][:api_request_timeout] = 20

 
 default[:nominatim][:config] = {
 
 default[:nominatim][:config] = {

-  :tokenizer => "icu",
-  :forward_dependencies => "no"
+  :tokenizer => "icu"

 }
 
 }
 

-default[:nominatim][:redirects] = {}
-

 default[:postgresql][:versions] |= [node[:nominatim][:dbcluster].split("/").first]
 default[:postgresql][:monitor_database] = "nominatim"
 
 default[:postgresql][:versions] |= [node[:nominatim][:dbcluster].split("/").first]
 default[:postgresql][:monitor_database] = "nominatim"