From ee5fa2341dacd447e56d5c8a1f77d140c1608ba1 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 10 Jun 2023 16:56:00 +0100 Subject: [PATCH] Remove old cogent addresses from various ACLs --- cookbooks/tile/templates/default/apache.erb | 4 ---- roles/backup.rb | 6 ++---- roles/ironbelly.rb | 6 ++---- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb index 5a2627919..9652ec825 100644 --- a/cookbooks/tile/templates/default/apache.erb +++ b/cookbooks/tile/templates/default/apache.erb @@ -75,10 +75,6 @@ <% @admins.sort.each do |address| -%> Require ip <%= address %> <% end -%> - # OSM Amsterdam Cogent IPv4 - 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 diff --git a/roles/backup.rb b/roles/backup.rb index 9db7e4c08..339ba54af 100644 --- a/roles/backup.rb +++ b/roles/backup.rb @@ -16,10 +16,8 @@ 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 (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) + "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 diff --git a/roles/ironbelly.rb b/roles/ironbelly.rb index f3494a4cb..a063d0d73 100644 --- a/roles/ironbelly.rb +++ b/roles/ironbelly.rb @@ -102,10 +102,8 @@ 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 (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) + "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 -- 2.39.5