Add new Amsterdam addresses to whitelists

diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index 7884ee1f4f97d8dfd8d5c4209e80b75e7a23cb97..5a2627919923e803d178641ab77505f4bdd75a33 100644 (file)
--- 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 c67956e171fa39c64636f44c4c9ead83b3819a1b..9db7e4c0804d38295b6da41e3f71f47487b80929 100644 (file)
--- 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 37d75c3036e90d487a3b9f4a73fb79c51f29f37a..aef5e90ae0966c3d121e204ad902849df2798e8f 100644 (file)
--- 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