X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/cb79d46f5ff53df3b97f93e62cd728f80fc05d49..51840ef4bddc309d05767b24832a8a891406d1da:/roles/backup.rb?ds=inline diff --git a/roles/backup.rb b/roles/backup.rb index 1a9f1911b..d08483d1c 100644 --- a/roles/backup.rb +++ b/roles/backup.rb @@ -2,11 +2,6 @@ name "backup" description "Role applied to backup.openstreetmap.org" default_attributes( - :accounts => { - :users => { - :osmbackup => { :status => :role } - } - }, :rsyncd => { :modules => { :backup => { @@ -19,16 +14,19 @@ default_attributes( :gid => "osmbackup", :transfer_logging => false, :hosts_allow => [ - "128.40.168.0/24", # ucl external (wates) - "128.40.45.192/27", # ucl external (wolfson) - "146.179.159.160/27", # ic internal - "193.63.75.96/27", # ic external - "2001:630:12:500::/64", # ic external + "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.32.0/20", # bytemark internal "89.16.162.16/28", # bytemark external "2001:41c9:2:d6::/64", # bytemark external "212.110.172.32", # shenron "2001:41c9:1:400::32", # shenron + "140.211.167.104", # osuosl + "140.211.167.105", # osuosl + "2605:bc80:3010:700::8cde:a768", # osuosl + "2605:bc80:3010:700::8cde:a769", # osuosl "127.0.0.0/8", # localhost "::1" # localhost ]