X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/21958591555b0b80370e944e3128ac5d533c281d..9609940accb4bc20bc380f2b35e850c0f5d0f66d:/roles/ridley.rb?ds=inline diff --git a/roles/ridley.rb b/roles/ridley.rb index f4f45c032..bb07b565f 100644 --- 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" @@ -61,9 +67,17 @@ default_attributes( :port => "1194" } }, - :firefishy => { + :ucl2bm => { :port => "1196", :mode => "client", + :peer => { + :host => "grisu.openstreetmap.org", + :port => "1196" + } + }, + :firefishy => { + :port => "1197", + :mode => "client", :peer => { :host => "home.firefishy.com", :port => "1194", @@ -76,7 +90,7 @@ default_attributes( run_list( "role[ucl-wolfson]", - "role[hp-g6]", + "role[hp-dl360-g6]", "role[gateway]", "role[foundation]", "role[stateofthemap]",