X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a8dddbf96f79756a2eb81443b245bcca7afd11ec..240370ecf151a61a7b2fddbfc035d60ee9a11863:/roles/ridley.rb diff --git a/roles/ridley.rb b/roles/ridley.rb index eaaa8f8cb..47e12e7d0 100644 --- a/roles/ridley.rb +++ b/roles/ridley.rb @@ -2,7 +2,13 @@ name "ridley" description "Master role applied to ridley" default_attributes( - :dhcpd =>{ + :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" } } @@ -39,7 +45,7 @@ default_attributes( :role => :internal, :family => :inet, :address => "10.0.0.3" - }, + } } }, :openvpn => { @@ -76,7 +82,7 @@ default_attributes( run_list( "role[ucl-wolfson]", - "role[hp-g6]", + "role[hp-dl360-g6]", "role[gateway]", "role[foundation]", "role[stateofthemap]",