X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/da8f75f725d2c105419c351195231bac70a46e7c..6b5908f5a53799fb55becad254408c1d273f2047:/roles/ridley.rb diff --git a/roles/ridley.rb b/roles/ridley.rb index 371d39f85..efcdd4c7d 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" } } @@ -32,14 +38,14 @@ default_attributes( :interface => "eth0", :role => :external, :family => :inet, - :address => "128.40.168.102" + :address => "128.40.45.205" }, :internal_ipv4 => { :interface => "eth1", :role => :internal, :family => :inet, :address => "10.0.0.3" - }, + } } }, :openvpn => { @@ -75,7 +81,8 @@ default_attributes( ) run_list( - "role[ucl-internal]", + "role[ucl-wolfson]", + "role[hp-g6]", "role[gateway]", "role[foundation]", "role[stateofthemap]",