Actively disable mod_evasive when necessary

[chef.git] / roles / balerion.rb

diff --git a/roles/balerion.rb b/roles/balerion.rb
index bb50b0d974bd1d2fc2afaae7ac865870d9cc4516..60e6bbcb06f3e137a7e02de11c86afb85546088a 100644 (file)
--- a/roles/balerion.rb
+++ b/roles/balerion.rb
@@ -4,15 +4,16 @@ description "Master role applied to balerion"
 default_attributes(
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
+      :external => {
         :interface => "bond0",
         :role => :external,
-        :family => :inet,
-        :address => "138.44.68.134",
-        :prefix => "30",
-        :gateway => "138.44.68.133",
+        :inet => {
+          :address => "138.44.68.134",
+          :prefix => "30",
+          :gateway => "138.44.68.133"
+        },
         :bond => {
-          :slaves => %w[ens14f0 ens14f1 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,9 +36,10 @@ default_attributes(
   },
   :tile => {
     :database => {
-      :cluster => "12/main",
+      :cluster => "16/main",
       :postgis => "3"
     },
+    :mapnik => "3.1",
     :styles => {
       :default => {
         :tile_directories => [