X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/9008d777073efab4dd0ffe0d3c79d4b2339726e7..5d33b4e76966a4ae9f78cbd414daab5ef47475c6:/roles/backup.rb?ds=sidebyside diff --git a/roles/backup.rb b/roles/backup.rb index cdc361cc2..00c73fd82 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 => { @@ -20,21 +15,48 @@ default_attributes( :transfer_logging => false, :hosts_allow => [ "193.60.236.0/24", # ucl external - "146.179.159.160/27", # ic internal - "193.63.75.96/27", # ic external - "2001:630:12:500::/64", # ic external + "10.0.48.0/20", # amsterdam internal + "184.104.179.128/27", # amsterdam external + "2001:470:1:fa1::/64", # amsterdam external + "10.0.64.0/20", # dublin internal + "184.104.226.96/27", # dublin external + "2001:470:1:b3b::/64", # dublin 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 + "140.211.167.99", # osuosl + "140.211.167.100", # osuosl + "2605:bc80:3010:700::8cd3:a763", # osuosl + "2605:bc80:3010:700::8cd3:a764", # osuosl "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 + "2001:470:1:fa1::/64", # amsterdam external + "10.0.64.0/20", # dublin internal + "184.104.226.96/27", # dublin external + "2001:470:1:b3b::/64", # dublin 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 + ] } } }