Pass bantime and findtime to jail config correctly

[chef.git] / roles / bowser.rb

diff --git a/roles/bowser.rb b/roles/bowser.rb
index 8cc8954b6521a9fd49a2ef9c7e8b55d0c12ad86c..8ebde6e8bf4fcaf33c25d9d83280e1d63c747ff7 100644 (file)
--- a/roles/bowser.rb
+++ b/roles/bowser.rb
@@ -4,15 +4,16 @@ description "Master role applied to bowser"
 default_attributes(
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
+      :external => {
         :interface => "bond0",
         :role => :external,
-        :family => :inet,
-        :address => "138.44.68.106",
-        :prefix => "30",
-        :gateway => "138.44.68.105",
+        :inet => {
+          :address => "138.44.68.106",
+          :prefix => "30",
+          :gateway => "138.44.68.105"
+        },
         :bond => {
-          :slaves => %w[ens14f0np0 ens14f0np1]
+          :slaves => %w[ens14f0np0 ens14f1np1]
         }
       }
     }
@@ -20,8 +21,6 @@ default_attributes(
   :postgresql => {
     :settings => {
       :defaults => {
-        :shared_buffers => "8GB",
-        :maintenance_work_mem => "7144MB",
         :effective_cache_size => "16GB"
       }
     }
@@ -37,7 +36,7 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "12/main",
+      :cluster => "16/main",
       :postgis => "3"
     },
     :mapnik => "3.1",