Drop all use of SSLCertificateChainFile in apache configs

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index d3244ea8869be1793c9ca07bcbede563e2ef0710..13ba3dafd72cc73d2553bf4db136c521f00268ae 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -7,8 +7,7 @@ default_attributes(
   },
   :apache => {
     :ssl => {
-      :certificate => "osmfoundation",
-      :certificate_chain => "startcom"
+      :certificate => "osmfoundation"
     }
   },
   :dhcpd => {
@@ -33,13 +32,13 @@ default_attributes(
   :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"
@@ -87,7 +86,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl]",
   "role[hp-dl360-g6]",
   "role[gateway]",
   "role[foundation]",