Allow database connections from VPN addresses

[chef.git] / roles / ridley.rb

diff --git a/roles/ridley.rb b/roles/ridley.rb
index 9a1093fb2dcceeb9413800c7fad4d9a07767bdc7..47e12e7d0012c80b736fe3a8be71b626abfab603 100644 (file)
--- a/roles/ridley.rb
+++ b/roles/ridley.rb
@@ -2,6 +2,12 @@ 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"
@@ -19,7 +25,7 @@ default_attributes(
         :category => "Ups",
         :values => {
           :load => {
-            :sum => [ "apcpdu_apc1.load", "apcpdu_apc2.load", "apcpdu_apc3.load" ],
+            :sum => ["apcpdu_apc1.load", "apcpdu_apc2.load", "apcpdu_apc3.load"],
             :label => "Load"
           }
         }
@@ -76,7 +82,7 @@ default_attributes(
 
 run_list(
   "role[ucl-wolfson]",
-  "role[hp-g6]",
+  "role[hp-dl360-g6]",
   "role[gateway]",
   "role[foundation]",
   "role[stateofthemap]",