X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e8c16eea4f5dca742180060e9ade71aacb3ef341..cf104d6ba87464701b5abe7ce7264ecbc0c261b9:/roles/pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index b15c5f013..05393514c 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -4,53 +4,69 @@ description "Master role applied to pummelzacken"
 default_attributes(
   :networking => {
     :interfaces => {
+      :bond => {
+        :interface => "bond0",
+        :bond => {
+          :slaves => %w[eno1 enp5s0f0]
+        }
+      },
       :internal_ipv4 => {
-        :interface => "em1",
+        :interface => "bond0.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"
       },
       :external_ipv4 => {
-        :interface => "em2",
+        :interface => "bond0.2800",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.204"
+        :address => "193.60.236.18"
       }
     }
   },
   :postgresql => {
-    :versions => ["9.5"],
+    :versions => ["13"],
     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
-        :effective_cache_size => "60GB"
+        :effective_cache_size => "60GB",
+        :effective_io_concurrency => "256",
+        :fsync => "on"
       }
     }
   },
+  :apache => {
+    :event => {
+      :max_request_workers => 3000,
+      :threads_per_child => 70
+    }
+  },
   :nominatim => {
-    :dbadmins => ["lonvia", "tomh"],
-    :dbcluster => "9.5/main",
+    :state => "standalone",
+    :dbadmins => %w[lonvia tomh],
+    :dbcluster => "13/main",
+    :postgis => "3",
+    :enable_backup => true,
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :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"=> "/data/tablespaces/daux",
-      "iaux"=> "/data/tablespaces/iaux"
-    },
-    :revision => "cmake-port"
+      "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" => "/data/tablespaces/daux",
+      "iaux" => "/data/tablespaces/iaux"
+    }
   }
 )
 
 run_list(
-  "role[ucl-wolfson]",
-  "role[nominatim-base]"
+  "role[ucl]",
+  "role[nominatim]"
 )