Merge remote-tracking branch 'github/pull/528'

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

diff --git a/cookbooks/nominatim/attributes/default.rb b/cookbooks/nominatim/attributes/default.rb
index e29fd7931e0eeb174274df5ae3901b0d81d43dab..301faf53d905aa4f029b9ab5cd452bcad35da870 100644 (file)
--- a/cookbooks/nominatim/attributes/default.rb
+++ b/cookbooks/nominatim/attributes/default.rb
@@ -1,25 +1,33 @@
 default[:nominatim][:state] = "off" # or: standalone, master, slave
 default[:nominatim][:dbadmins] = []
 default[:nominatim][:state] = "off" # or: standalone, master, slave
 default[:nominatim][:dbadmins] = []

-default[:nominatim][:dbcluster] = "12/main"
+default[:nominatim][:dbcluster] = "14/main"

 default[:nominatim][:dbname] = "nominatim"
 default[:nominatim][:tablespaces] = []
 default[:nominatim][:dbname] = "nominatim"
 default[:nominatim][:tablespaces] = []

-default[:nominatim][:postgis] = "2.5"
+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][: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][:ui_repository] = "https://github.com/osm-search/nominatim-ui"
+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][:ui_revision] = "master"

+default[:nominatim][:qa_repository] = "https://github.com/osm-search/Nominatim-Data-Analyser"
+default[:nominatim][:qa_revision] = "main"

 
 default[:nominatim][:fpm_pools] = {
 
 default[:nominatim][:fpm_pools] = {

-  :www => {
-    :port => 8000,
+  "nominatim.openstreetmap.org" => {

     :pm => "dynamic",
     :pm => "dynamic",

-    :max_children => 60
+    :max_children => 60,
+    :prometheus_port => 9253

   }
 }
 
   }
 }
 

+default[:nominatim][:config] = {
+  :tokenizer => "icu",
+  :forward_dependencies => "no"
+}
+

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