wordpress: ignore failure to activate SVN plugins. Pin wp-fail2ban release

[chef.git] / roles / meraxes.rb

diff --git a/roles/meraxes.rb b/roles/meraxes.rb
index 6123444078d303e71a2c20e51a33b9de3071b7e3..3c75dba623ad851ad8c458dbb47800b6dba253c2 100644 (file)
--- a/roles/meraxes.rb
+++ b/roles/meraxes.rb
@@ -4,21 +4,23 @@ description "Master role applied to meraxes"
 default_attributes(
   :networking => {
     :interfaces => {
 default_attributes(
   :networking => {
     :interfaces => {

-      :external_ipv4 => {
+      :external => {

         :interface => "enp1s0f0",
         :role => :external,
         :interface => "enp1s0f0",
         :role => :external,

-        :family => :inet,
-        :address => "51.15.185.90",
-        :prefix => "24",
-        :gateway => "51.15.185.1"
-      },
-      :external_ipv6 => {
-        :interface => "enp1s0f0",
-        :role => :external,
-        :family => :inet6,
-        :address => "2001:bc8:2d57:100:aa1e:84ff:fe72:e660",
-        :prefix => "48",
-        :gateway => "2001:bc8:2::2:258:1"
+        :inet => {
+          :address => "51.15.185.90",
+          :prefix => "24",
+          :gateway => "51.15.185.1"
+        },
+        :inet6 => {
+          :address => "2001:bc8:2d57:100:aa1e:84ff:fe72:e660",
+          :prefix => "48",
+          :gateway => "2001:bc8:2::2:258:1",
+          :dhcp => {
+            :duidtype => "link-layer",
+            :duidrawdata => "00:01:14:e9:19:1c:49:e0"
+          }
+        }

       }
     }
   }
       }
     }
   }