Fix port range syntax for nftables

[chef.git] / roles / pummelzacken.rb

diff --git a/roles/pummelzacken.rb b/roles/pummelzacken.rb
index 7b346bf6f5f4492712e518d25f75aa31d5915bca..0aa526bca6d4a854488d68230f15d3ff50bcf83b 100644 (file)
--- a/roles/pummelzacken.rb
+++ b/roles/pummelzacken.rb
@@ -7,7 +7,7 @@ default_attributes(
       :bond => {
         :interface => "bond0",
         :bond => {
-          :slaves => %w[em1 p5p1]
+          :slaves => %w[eno1 enp5s0f0]
         }
       },
       :internal_ipv4 => {
@@ -23,50 +23,9 @@ default_attributes(
         :address => "193.60.236.18"
       }
     }
-  },
-  :postgresql => {
-    :versions => ["12"],
-    :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",
-        :fsync => "on"
-      }
-    }
-  },
-  :apache => {
-    :event => {
-      :max_request_workers => 3000,
-      :threads_per_child => 70
-    }
-  },
-  :nominatim => {
-    :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]",
-  "role[nominatim]"
+  "role[ucl]"
 )