X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d54d5af5b52fe7c631ff9796c31e384f51f61b7e..530cc480bd3624cf4eed5f18f7f792a85067e631:/roles/stormfly-04.rb

diff --git a/roles/stormfly-04.rb b/roles/stormfly-04.rb
index af518eb91..88b0568e8 100644
--- a/roles/stormfly-04.rb
+++ b/roles/stormfly-04.rb
@@ -7,31 +7,26 @@ default_attributes(
   },
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
+      :external => {
         :interface => "bond0",
         :role => :external,
-        :family => :inet,
-        :address => "140.211.167.100",
+        :inet => {
+          :address => "140.211.167.100"
+        },
+        :inet6 => {
+          :address => "2605:bc80:3010:700::8cd3:a764"
+        },
         :bond => {
           :slaves => %w[eno1 eno2 eno3 eno4 eno49 eno50]
         }
-      },
-      :external_ipv6 => {
-        :interface => "bond0",
-        :role => :external,
-        :family => :inet6,
-        :address => "2605:bc80:3010:700::8cd3:a764"
       }
     }
   },
   :postgresql => {
-    :versions => ["12"],
+    :versions => ["15"],
     :settings => {
       :defaults => {
         :work_mem => "300MB",
-        :maintenance_work_mem => "10GB",
-        :random_page_cost => "1.5",
-        :effective_cache_size => "60GB",
         :fsync => "on",
         :effective_io_concurrency => "100"
       }
@@ -39,30 +34,12 @@ default_attributes(
   },
   :nominatim => {
     :state => "standalone",
-    :enable_backup => false,
-    :enable_git_updates => true,
-    :dbadmins => %w[lonvia tomh],
-    :dbcluster => "12/main",
-    :postgis => "2.5",
-    :flatnode_file => "/ssd/nominatim/nodes.store",
-    :logdir => "/ssd/nominatim/log",
-    :fpm_pools => {
-      "nominatim.openstreetmap.org" => {
-        :max_children => 100
-      }
-    },
-    :tablespaces => {
-      "dosm" => "/ssd/tablespaces/dosm",
-      "iosm" => "/ssd/tablespaces/iosm",
-      "dplace" => "/ssd/tablespaces/dplace",
-      "iplace" => "/ssd/tablespaces/iplace",
-      "daddress" => "/ssd/tablespaces/daddress",
-      "iaddress" => "/ssd/tablespaces/iaddress",
-      "dsearch" => "/ssd/tablespaces/dsearch",
-      "isearch" => "/ssd/tablespaces/isearch",
-      "daux" => "/ssd/tablespaces/daux",
-      "iaux" => "/ssd/tablespaces/iaux"
-    }
+    :dbcluster => "15/main",
+    :postgis => "3",
+    :flatnode_file => "/srv/nominatim.openstreetmap.org/planet-project/nodes.store",
+    :api_flavour => "python",
+    :api_workers => 18,
+    :api_pool_size => 8
   }
 )