tilecache: reject request without user-agent (try2)

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index d87bd4b1d1a790841aaf441d3a51ae9846a2dde5..ec985da04a56922af308e3b56770e18e738b8064 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,34 +2,10 @@ name "ridley"
 description "Master role applied to ridley"
 
 default_attributes(
-  :ssl => {
-    :certificates => %w(osmfoundation openstreetmap)
-  },
-  :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 => {
@@ -87,7 +63,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-slough]",
+  "role[ucl]",
   "role[hp-dl360-g6]",
   "role[gateway]",
   "role[foundation]",
@@ -96,6 +72,8 @@ run_list(
   "role[blog]",
   "role[otrs]",
   "role[donate]",
+  "recipe[hot]",
+  "recipe[dmca]",
   "recipe[dhcpd]",
   "recipe[openvpn]"
 )