civi version bump

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

diff --git a/cookbooks/nominatim/attributes/default.rb b/cookbooks/nominatim/attributes/default.rb
index ab273d84a556acc13f1d74d0cf1ca952705f50e2..1edb544d280dc63ccbdfaae5e9bb0f8195f96469 100644 (file)
--- a/cookbooks/nominatim/attributes/default.rb
+++ b/cookbooks/nominatim/attributes/default.rb
@@ -1,28 +1,39 @@
 default[:nominatim][:state] = "off" # or: standalone, master, slave
 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][:repository] = "git://git.openstreetmap.org/nominatim.git"
+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][: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][:api_workers] = 10
+default[:nominatim][:api_pool_size] = 10
 
 default[:nominatim][:fpm_pools] = {
-  :www => {
-    :port => "8000",
+  "nominatim.openstreetmap.org" => {
     :pm => "dynamic",
-    :max_children => "60"
-  },
-  :bulk => {
-    :port => "8001",
-    :pm => "static",
-    :max_children => "10"
-  },
-  :details => {
-    :port => "8002",
-    :pm => "static",
-    :max_children => "2"
+    :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[:postgresql][:monitor_database] = "nominatim"
+
+default[:accounts][:users][:nominatim][:status] = :role