nominatim: switch to deploy tag for QA repo

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

diff --git a/cookbooks/nominatim/attributes/default.rb b/cookbooks/nominatim/attributes/default.rb
index 67708f9a1423691af2605039184c44f67dcaca77..510dc4bcbe179dc41fd89ca13bcdab0e9a66fb6d 100644 (file)
--- a/cookbooks/nominatim/attributes/default.rb
+++ b/cookbooks/nominatim/attributes/default.rb
@@ -1,29 +1,41 @@
 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] = "14/main"

 default[:nominatim][:dbname] = "nominatim"
 default[:nominatim][:tablespaces] = []
 default[:nominatim][:dbname] = "nominatim"
 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][: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_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] = "deploy"
+default[:nominatim][:api_flavour] = "php"
+default[:nominatim][:api_workers] = 10
+default[:nominatim][:api_pool_size] = 10
+default[:nominatim][:api_query_timeout] = 5
+default[:nominatim][:api_request_timeout] = 20

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

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

     :pm => "dynamic",
     :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[:nominatim][:redirects] = {}

+
+default[:postgresql][:versions] |= [node[:nominatim][:dbcluster].split("/").first]
+default[:postgresql][:monitor_database] = "nominatim"
+
+default[:accounts][:users][:nominatim][:status] = :role