X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/3ee8d7a32363483535b21a38e56002189f56b5b6..b5f1516eba7a79f6f3ec6d7eb5e3517f544cda3f:/roles/ironbelly.rb diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb index 098568265..4eb5fbc45 100644 --- a/roles/ironbelly.rb +++ b/roles/ironbelly.rb @@ -59,9 +59,27 @@ default_attributes( :peer => { :host => "ridley.openstreetmap.org" } + }, + :aws2ic => { + :port => "1195", + :mode => "server", + :peer => { + :host => "fafnir.openstreetmap.org" + } + }, + :ic2bm => { + :port => "1196", + :mode => "client", + :peer => { + :host => "grisu.openstreetmap.org", + :port => "1194" + } } } }, + :planet => { + :replication => "enabled" + }, :rsyncd => { :modules => { :hosts => { @@ -94,6 +112,9 @@ default_attributes( "146.179.159.160/27", # ic internal "193.63.75.96/27", # ic external "2001:630:12:500::/64", # ic external + "10.0.32.0/20", # bytemark internal + "89.16.162.16/28", # bytemark external + "2001:41c9:2:d6::/64", # bytemark external "127.0.0.0/8", # localhost "::1" # localhost ], @@ -118,5 +139,6 @@ run_list( "recipe[rsyncd]", "recipe[openvpn]", "recipe[git::server]", - "recipe[tilelog]" + "recipe[tilelog]", + "recipe[serverinfo]" )