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

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 365866e46f796deecb596ff804b9810f45818ec9..5ce024ec76e6505c99d40756ac6b2e1b823f33b8 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -4,14 +4,20 @@ description "Master role applied to pummelzacken"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

+      :bond => {
+        :interface => "bond0",
+        :bond => {
+          :slaves => %w[eno1 enp5s0f0]
+        }
+      },

       :internal_ipv4 => {
       :internal_ipv4 => {

-        :interface => "em1.2801",
+        :interface => "bond0.2801",

         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"
       },
       :external_ipv4 => {
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.20"
       },
       :external_ipv4 => {

-        :interface => "em1.2800",
+        :interface => "bond0.2800",

         :role => :external,
         :family => :inet,
         :address => "193.60.236.18"
         :role => :external,
         :family => :inet,
         :address => "193.60.236.18"


@@ -19,7 +25,7 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

-    :versions => ["10"],
+    :versions => ["13"],

     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",


@@ -27,17 +33,21 @@ default_attributes(
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",
         :maintenance_work_mem => "10GB",
         :random_page_cost => "1.5",
         :effective_cache_size => "60GB",

-        :fsync => "off"
+        :effective_io_concurrency => "256",
+        :fsync => "on"

       }
     }
   },
   :nominatim => {
       }
     }
   },
   :nominatim => {

-    :state => "off",
+    :state => "standalone",

     :dbadmins => %w[lonvia tomh],
     :dbadmins => %w[lonvia tomh],

-    :dbcluster => "10/main",
-    :postgis => "2.4",
+    :dbcluster => "13/main",
+    :postgis => "3",

     :enable_backup => true,
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :enable_backup => true,
     :flatnode_file => "/ssd/nominatim/nodes.store",

+    :config => {
+      :tokenizer => "icu"
+    },

     :tablespaces => {
       "dosm" => "/ssd/tablespaces/dosm",
       "iosm" => "/ssd/tablespaces/iosm",
     :tablespaces => {
       "dosm" => "/ssd/tablespaces/dosm",
       "iosm" => "/ssd/tablespaces/iosm",


@@ -49,11 +59,6 @@ default_attributes(
       "isearch" => "/ssd/tablespaces/isearch",
       "daux" => "/data/tablespaces/daux",
       "iaux" => "/data/tablespaces/iaux"
       "isearch" => "/ssd/tablespaces/isearch",
       "daux" => "/data/tablespaces/daux",
       "iaux" => "/data/tablespaces/iaux"

-    },
-    :fpm_pools => {
-      :www => {
-        :max_children => "40"
-      }

     }
   }
 )
     }
   }
 )