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

[chef.git] / roles / stormfly-04.rb

diff --git a/roles/stormfly-04.rb b/roles/stormfly-04.rb
index 943c747fd4147005a9d18b3f3067998f71c94ba4..4b94cb28bb5ca48eedd5db44550af8a63d4170e6 100644 (file)
--- a/roles/stormfly-04.rb
+++ b/roles/stormfly-04.rb
@@ -23,7 +23,7 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => ["14"],
+    :versions => ["15"],

     :settings => {
       :defaults => {
         :work_mem => "300MB",
     :settings => {
       :defaults => {
         :work_mem => "300MB",


@@ -34,18 +34,12 @@ default_attributes(
   },
   :nominatim => {
     :state => "standalone",
   },
   :nominatim => {
     :state => "standalone",

-    :dbcluster => "14/main",
+    :dbcluster => "15/main",

     :postgis => "3",
     :postgis => "3",

-    :flatnode_file => "/ssd/nominatim/nodes.store",
-    :logdir => "/ssd/nominatim/log",
-    :api_flavour => "php",
-    :api_workers => 18,
-    :api_pool_size => 8,
-    :fpm_pools => {
-      "nominatim.openstreetmap.org" => {
-        :max_children => 80
-      }
-    }
+    :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",
+    :api_flavour => "python",
+    :api_workers => 19,
+    :api_pool_size => 7

   }
 )
 
   }
 )