X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/e83395675fe4f9b35a1d83e99c50d1ea6fbe79fd..89e79e81b8da8ec51cf058e4877a749031477d92:/roles/ridley.rb diff --git a/roles/ridley.rb b/roles/ridley.rb index efcdd4c7d..0edbf7eea 100644 --- a/roles/ridley.rb +++ b/roles/ridley.rb @@ -12,11 +12,6 @@ default_attributes( :first_address => "10.0.15.1", :last_address => "10.0.15.254" }, - :exim => { - :aliases => { - :root => "grant" - } - }, :munin => { :graphs => { :apcpdu_ucl => { @@ -67,9 +62,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", @@ -82,7 +85,7 @@ default_attributes( run_list( "role[ucl-wolfson]", - "role[hp-g6]", + "role[hp-dl360-g6]", "role[gateway]", "role[foundation]", "role[stateofthemap]",