X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/5fb7a990481702f72801bc430b0f01675af38f94..2a3be76929b0a86a7cf206c3aef5151dfa2c2e5d:/roles/ridley.rb?ds=sidebyside

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 7bbcc3839..62228f5bc 100644
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,41 +2,20 @@ name "ridley"
 description "Master role applied to ridley"
 
 default_attributes(
-  :apache => {
-    :ssl => {
-      :certificate => "osmfoundation",
-      :certificate_chain => "startcom"
-    }
-  },
   :dhcpd => {
     :first_address => "10.0.15.1",
     :last_address => "10.0.15.254"
   },
-  :munin => {
-    :graphs => {
-      :apcpdu_ucl => {
-        :title => "Current for UCL",
-        :vlabel => "Amps",
-        :category => "Ups",
-        :values => {
-          :load => {
-            :sum => ["apcpdu_apc1.load", "apcpdu_apc2.load", "apcpdu_apc3.load"],
-            :label => "Load"
-          }
-        }
-      }
-    }
-  },
   :networking => {
     :interfaces => {
       :external_ipv4 => {
-        :interface => "eth0",
+        :interface => "eth0.2800",
         :role => :external,
         :family => :inet,
-        :address => "128.40.45.205"
+        :address => "193.60.236.19"
       },
       :internal_ipv4 => {
-        :interface => "eth1",
+        :interface => "eth0.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.3"
@@ -84,7 +63,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl]",
   "role[hp-dl360-g6]",
   "role[gateway]",
   "role[foundation]",
@@ -93,6 +72,7 @@ run_list(
   "role[blog]",
   "role[otrs]",
   "role[donate]",
+  "recipe[hot]",
   "recipe[dhcpd]",
   "recipe[openvpn]"
 )