nominatim: reorganise recipe for Debian installation

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

diff --git a/cookbooks/nominatim/attributes/default.rb b/cookbooks/nominatim/attributes/default.rb
index dca4e71e6ea0076cb80351653948d7df90512268..a7037ee206ded534faa66dd0e6bb3df721bf7856 100644 (file)
--- a/cookbooks/nominatim/attributes/default.rb
+++ b/cookbooks/nominatim/attributes/default.rb
@@ -5,15 +5,21 @@ default[:nominatim][:dbname] = "nominatim"
 default[:nominatim][:tablespaces] = []
 default[:nominatim][:postgis] = "3"
 default[:nominatim][:logdir] = "/var/log/nominatim"
 default[:nominatim][:tablespaces] = []
 default[:nominatim][:postgis] = "3"
 default[:nominatim][:logdir] = "/var/log/nominatim"

+default[:nominatim][:pip_index] = "https://nominatim.org/data/osm-production"

 default[:nominatim][:repository] = "https://git.openstreetmap.org/public/nominatim.git"
 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][: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_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][:qa_revision] = "deploy"
+default[:nominatim][:api_flavour] = "python"
+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] = {
   "nominatim.openstreetmap.org" => {
 
 default[:nominatim][:fpm_pools] = {
   "nominatim.openstreetmap.org" => {


@@ -24,11 +30,13 @@ default[:nominatim][:fpm_pools] = {
 }
 
 default[:nominatim][:config] = {
 }
 
 default[:nominatim][:config] = {

-  :tokenizer => "icu"
+  :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]

+default[:postgresql][:monitor_database] = "nominatim"

 
 default[:accounts][:users][:nominatim][:status] = :role
 
 default[:accounts][:users][:nominatim][:status] = :role