X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/d5f632a79b3bab323f9af5b02940dcc75e618fa5..4722e0f97ac741783a6ed28fa49a5548295d64a0:/roles/ridley.rb?ds=sidebyside

diff --git a/roles/ridley.rb b/roles/ridley.rb
index aee7655c9..7500247f3 100644
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,6 +2,11 @@ name "ridley"
 description "Master role applied to ridley"
 
 default_attributes(
+  :accounts => {
+    :users => {
+      :otrs => { :status => :role }
+    }
+  },
   :apache => {
     :mpm => "event",
     :event => {
@@ -12,26 +17,25 @@ default_attributes(
       :max_connections_per_child => 10000
     }
   },
-  :bind => {
-    :clients => "ucl"
-  },
   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
   },
   :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,12 +47,6 @@ run_list(
   "role[gateway]",
   "role[foundation]",
   "role[stateofthemap]",
-  "role[switch2osm]",
   "role[blog]",
-  "role[otrs]",
-  "role[donate]",
-  "recipe[hot]",
-  "recipe[dmca]",
-  "recipe[dhcpd]",
-  "recipe[ideditor]"
+  "recipe[dhcpd]"
 )