X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/8c68cdc3cf6bd184a0b5321dc13b8f61228c7c65..20e6d4524062198d6521c5e692e73c57984a322a:/roles/ridley.rb?ds=sidebyside diff --git a/roles/ridley.rb b/roles/ridley.rb index efcdd4c7d..d3244ea88 100644 --- a/roles/ridley.rb +++ b/roles/ridley.rb @@ -2,6 +2,9 @@ name "ridley" description "Master role applied to ridley" default_attributes( + :ssl => { + :certificates => %w(osmfoundation openstreetmap) + }, :apache => { :ssl => { :certificate => "osmfoundation", @@ -12,11 +15,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 +65,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,14 +88,14 @@ default_attributes( run_list( "role[ucl-wolfson]", - "role[hp-g6]", + "role[hp-dl360-g6]", "role[gateway]", "role[foundation]", "role[stateofthemap]", "role[switch2osm]", "role[blog]", "role[otrs]", - "role[thinkup]", + "role[donate]", "recipe[dhcpd]", "recipe[openvpn]" )