X-Git-Url: https://git.openstreetmap.org/chef.git/blobdiff_plain/cefb1fe9134e29ef41a021dc824d291407c94cb6..91ea002ac9e3f1383e3f4d857f6157491e27dea9:/roles/ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 804aace16..7a653f422 100644
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -18,17 +18,19 @@ default_attributes(
   },
   :networking => {
     :interfaces => {
-      :external_ipv4 => {
+      :external => {
         :interface => "eth0.2800",
         :role => :external,
-        :family => :inet,
-        :address => "193.60.236.19"
+        :inet => {
+          :address => "193.60.236.19"
+        }
       },
-      :internal_ipv4 => {
+      :internal => {
         :interface => "eth0.2801",
         :role => :internal,
-        :family => :inet,
-        :address => "10.0.0.3"
+        :inet => {
+          :address => "10.0.0.3"
+        }
       }
     }
   }
@@ -43,8 +45,6 @@ run_list(
   "role[blog]",
   "role[otrs]",
   "role[donate]",
-  "recipe[hot]",
   "recipe[dmca]",
-  "recipe[dhcpd]",
-  "recipe[ideditor]"
+  "recipe[dhcpd]"
 )