X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9d0a4187f46e504aabb6f93dfc02fb837dcc8083..9e3d6bc2332036591015cf6171a685536e26b3c1:/roles/backup.rb?ds=sidebyside diff --git a/roles/backup.rb b/roles/backup.rb index 63ec1b1aa..5cbec26d6 100644 --- a/roles/backup.rb +++ b/roles/backup.rb @@ -15,9 +15,16 @@ default_attributes( :transfer_logging => false, :hosts_allow => [ "193.60.236.0/24", # ucl external - "10.0.48.0/20", # equinix internal - "130.117.76.0/27", # equinix external - "2001:978:2:2C::172:0/112", # equinix external + "10.0.48.0/20", # amsterdam internal + "184.104.179.128/27", # amsterdam external (he.net) + "2001:470:1:fa1::/64", # amsterdam external (he.net) + "82.199.86.96/27", # amsterdam external (equinix) + "2001:4d78:500:5e3::/64", # amsterdam external (equinix) + "10.0.64.0/20", # dublin internal + "184.104.226.96/27", # dublin external (he.net) + "2001:470:1:b3b::/64", # dublin external (he.net) + "87.252.214.96/27", # dublin external (equinix) + "2001:4d78:fe03:1c::/64", # dublin external (equinix) "10.0.32.0/20", # bytemark internal "89.16.162.16/28", # bytemark external "2001:41c9:2:d6::/64", # bytemark external @@ -30,6 +37,34 @@ default_attributes( "127.0.0.0/8", # localhost "::1" # localhost ] + }, + :logs => { + :comment => "Log files", + :path => "/store/logs", + :read_only => false, + :write_only => true, + :list => false, + :uid => "osmbackup", + :gid => "osmbackup", + :transfer_logging => false, + :hosts_allow => [ + "193.60.236.0/24", # ucl external + "10.0.48.0/20", # amsterdam internal + "184.104.179.128/27", # amsterdam external (he.net) + "2001:470:1:fa1::/64", # amsterdam external (he.net) + "82.199.86.96/27", # amsterdam external (equinix) + "2001:4d78:500:5e3::/64", # amsterdam external (equinix) + "10.0.64.0/20", # dublin internal + "184.104.226.96/27", # dublin external (he.net) + "2001:470:1:b3b::/64", # dublin external (he.net) + "87.252.214.96/27", # dublin external (equinix) + "2001:4d78:fe03:1c::/64", # dublin external (equinix) + "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 + ] } } }