Configure prometheus monitoring for PHP-FPM on nominatim servers

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

diff --git a/cookbooks/nominatim/attributes/default.rb b/cookbooks/nominatim/attributes/default.rb
index 2805a8606d59c4c707d4ffda980a12d59c378a3e..4e74848cd7dde1967440c1750aad700caefa3cdf 100644 (file)
--- a/cookbooks/nominatim/attributes/default.rb
+++ b/cookbooks/nominatim/attributes/default.rb
@@ -1,29 +1,28 @@
 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][:dbname] = "nominatim"
 default[:nominatim][:tablespaces] = []
 default[:nominatim][:dbname] = "nominatim"
 default[:nominatim][:tablespaces] = []

+default[:nominatim][:postgis] = "2.5"

 default[:nominatim][:logdir] = "/var/log/nominatim"
 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][: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][:ui_revision] = "master"

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

-    :port => "8000",
+    :port => 8000,

     :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][:redirects] = {}
   }
 }
 
 default[:nominatim][:redirects] = {}

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