X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/6872fc3e4707aa5e59eac2b5266b2ee5ebd43ed6..148677876eaf6ee2985babefc97cf830effd3a29:/roles/pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 05f6a0539..7b346bf6f 100644
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -4,46 +4,69 @@ description "Master role applied to pummelzacken"
 default_attributes(
   :networking => {
     :interfaces => {
+      :bond => {
+        :interface => "bond0",
+        :bond => {
+          :slaves => %w[em1 p5p1]
+        }
+      },
       :internal_ipv4 => {
-        :interface => "em1",
+        :interface => "bond0.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"
+      },
+      :external_ipv4 => {
+        :interface => "bond0.2800",
+        :role => :external,
+        :family => :inet,
+        :address => "193.60.236.18"
       }
     }
   },
   :postgresql => {
-    :versions => [ "9.3" ],
+    :versions => ["12"],
     :settings => {
       :defaults => {
-        :shared_buffers => "24GB",
+        :listen_addresses => "10.0.0.20",
         :work_mem => "160MB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
-        :effective_cache_size => "48GB"
+        :effective_cache_size => "60GB",
+        :effective_io_concurrency => "256",
+        :fsync => "on"
       }
     }
   },
+  :apache => {
+    :event => {
+      :max_request_workers => 3000,
+      :threads_per_child => 70
+    }
+  },
   :nominatim => {
-    :database => {
-        :cluster => "9.3/main",
-        :dbname => "nominatim",
-        :postgis => "2.1"
-    },
-    :fpm_pools => {
-        :www => {
-            :pm => "dynamic",
-            :max_children => "70"
-        },
-        :bulk => {
-            :pm => "static",
-            :max_children => "10"
-        }
+    :state => "standalone",
+    :dbadmins => %w[lonvia tomh],
+    :dbcluster => "12/main",
+    :postgis => "2.5",
+    :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"
     }
   }
 )
 
 run_list(
-  "role[ucl-internal]",
+  "role[ucl]",
   "role[nominatim]"
 )