Expire tiles from both osm.gz and osc.gz files

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 999482f8e0100c58f15cd1d4ee71f76e261651f1..f9ec9ebc782a42d42af0eab6403fc8ffdf4db4ea 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,15 +2,6 @@ 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"
@@ -39,7 +30,7 @@ default_attributes(
         :address => "193.60.236.19"
       },
       :internal_ipv4 => {
-        :interface => "eth0",
+        :interface => "eth0.2801",
         :role => :internal,
         :family => :inet,
         :address => "10.0.0.3"
@@ -87,7 +78,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-slough]",
+  "role[ucl]",
   "role[hp-dl360-g6]",
   "role[gateway]",
   "role[foundation]",