Remove old cogent addresses from various ACLs

diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index 5a2627919923e803d178641ab77505f4bdd75a33..9652ec8253ba6400ebdfcb5f3c8feba583657b12 100644 (file)
--- 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 -%>
 <% @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
     # OSM Amsterdam IPv4
     Require ip 184.104.179.128/27
     # OSM Amsterdam IPv6

diff --git a/roles/backup.rb b/roles/backup.rb
index 9db7e4c0804d38295b6da41e3f71f47487b80929..339ba54afc2bcf5ead241fd4815267e56e803756 100644 (file)
--- 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
         :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
           "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 f3494a4cb1c96e7482e0d4d50cf01e246a206213..a063d0d73e88309cc474d6bb0b0f6008b07d3c8c 100644 (file)
--- 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
         :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
           "10.0.64.0/20",             # dublin internal
           "184.104.226.96/27",        # dublin external
           "2001:470:1:b3b::/64",      # dublin external