Add all interfaces to bond on faffy

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index add5249388505e1b29a545098f3c46ac083fa499..d16fa71ad041d6ad5f5cf65f53e64f349e86241b 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -25,44 +25,27 @@ default_attributes(
     }
   },
   :postgresql => {
     }
   },
   :postgresql => {

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

     :settings => {
       :defaults => {
         :listen_addresses => "10.0.0.20",
         :work_mem => "160MB",
     :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_io_concurrency => "256",
         :effective_io_concurrency => "256",

-        :fsync => "off"
+        :fsync => "on"

       }
     }
   },
       }
     }
   },

-  :apache => {
-    :event => {
-      :max_request_workers => 3000,
-      :threads_per_child => 70
-    }
-  },

   :nominatim => {
   :nominatim => {

-    :state => "off",
-    :dbadmins => %w[lonvia tomh],
-    :dbcluster => "13/main",
+    :state => "standalone",
+    :dbcluster => "14/main",

     :postgis => "3",
     :enable_backup => true,
     :flatnode_file => "/ssd/nominatim/nodes.store",
     :tablespaces => {
     :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"
     }
       "daux" => "/data/tablespaces/daux",
       "iaux" => "/data/tablespaces/iaux"
     }

+

   }
 )
 
   }
 )