From 3a33d35c42600aa215df8467702c98bee73415f8 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Tue, 23 May 2023 21:11:51 +0100 Subject: [PATCH 1/1] Add new Amsterdam addresses to whitelists --- cookbooks/tile/templates/default/apache.erb | 4 ++++ roles/backup.rb | 6 ++++-- roles/ironbelly.rb | 6 ++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb index 7884ee1f4..5a2627919 100644 --- a/cookbooks/tile/templates/default/apache.erb +++ b/cookbooks/tile/templates/default/apache.erb @@ -79,6 +79,10 @@ Require ip 130.117.76.0/27 # OSM Amsterdam Cogent IPv6 Require ip 2001:978:2:2C::/64 + # OSM Amsterdam IPv4 + Require ip 184.104.179.128/27 + # OSM Amsterdam IPv6 + Require ip 2001:470:1:fa1::/64 # OSM Dublin IPv4 Require ip 184.104.226.96/27 # OSM Dublin IPv6 diff --git a/roles/backup.rb b/roles/backup.rb index c67956e17..9db7e4c08 100644 --- a/roles/backup.rb +++ b/roles/backup.rb @@ -16,8 +16,10 @@ default_attributes( :hosts_allow => [ "193.60.236.0/24", # ucl external "10.0.48.0/20", # amsterdam internal - "130.117.76.0/27", # amsterdam external - "2001:978:2:2c::172:0/112", # amsterdam external + "130.117.76.0/27", # amsterdam external (cogent) + "2001:978:2:2c::172:0/112", # amsterdam external (cogent) + "184.104.179.128/27", # amsterdam external (he) + "2001:470:1:fa1::/64", # amsterdam external (he) "10.0.64.0/20", # dublin internal "184.104.226.96/27", # dublin external "2001:470:1:b3b::/64", # dublin external diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb index 37d75c303..aef5e90ae 100644 --- a/roles/ironbelly.rb +++ b/roles/ironbelly.rb @@ -78,8 +78,10 @@ default_attributes( :hosts_allow => [ "193.60.236.0/24", # ucl external "10.0.48.0/20", # amsterdam internal - "130.117.76.0/27", # amsterdam external - "2001:978:2:2c::172:0/112", # amsterdam external + "130.117.76.0/27", # amsterdam external (cogent) + "2001:978:2:2c::172:0/112", # amsterdam external (cogent) + "184.104.179.128/27", # amsterdam external (he) + "2001:470:1:fa1::/64", # amsterdam external (he) "10.0.64.0/20", # dublin internal "184.104.226.96/27", # dublin external "2001:470:1:b3b::/64", # dublin external -- 2.39.5