Merge remote-tracking branch 'github/pull/102'

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 6595ba2ee30e4380e5d3ad79d6dab582ff06a726..7250ce893c72039cc4b74d3331bc10d83813d5b3 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,6 +2,9 @@ name "ridley"
 description "Master role applied to ridley"
 
 default_attributes(
+  :ssl => {
+    :certificates => %w(osmfoundation openstreetmap)
+  },
   :apache => {
     :ssl => {
       :certificate => "osmfoundation",
@@ -30,13 +33,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"
@@ -84,7 +87,7 @@ default_attributes(
 )
 
 run_list(
-  "role[ucl-wolfson]",
+  "role[ucl]",
   "role[hp-dl360-g6]",
   "role[gateway]",
   "role[foundation]",
@@ -92,6 +95,7 @@ run_list(
   "role[switch2osm]",
   "role[blog]",
   "role[otrs]",
+  "role[donate]",
   "recipe[dhcpd]",
   "recipe[openvpn]"
 )