Add new Amsterdam IPv6 addresses to ACLs

diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index 767baf3e3c7a13ec3029c4b808d6638aff05ddc1..a1c4e1977a40f75d171bc0fc8f03e8a890cc3931 100644 (file)
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -82,7 +82,7 @@
     # OSM Amsterdam IPv6 (he.net)
     Require ip 2001:470:1:fa1::/64
     # OSM Amsterdam IPv6 (equinix)
-    # Require ip
+    Require ip 2001:4d78:500:5e3::/64
     # OSM Dublin IPv4 (he.net)
     Require ip 184.104.226.96/27
     # OSM Dublin IPv4 (equinix)

diff --git a/roles/backup.rb b/roles/backup.rb
index f60e444c421cfc58279cbdc6f342d7d221276e77..5cbec26d65e741d419d7d97f9975fa1cfde497dc 100644 (file)
--- a/roles/backup.rb
+++ b/roles/backup.rb
@@ -19,7 +19,7 @@ default_attributes(
           "184.104.179.128/27",                  # amsterdam external (he.net)
           "2001:470:1:fa1::/64",                 # amsterdam external (he.net)
           "82.199.86.96/27",                     # amsterdam external (equinix)
-          # "/64",                                 # amsterdam external (equinix)
+          "2001:4d78:500:5e3::/64",              # amsterdam external (equinix)
           "10.0.64.0/20",                        # dublin internal
           "184.104.226.96/27",                   # dublin external (he.net)
           "2001:470:1:b3b::/64",                 # dublin external (he.net)
@@ -53,7 +53,7 @@ default_attributes(
           "184.104.179.128/27",       # amsterdam external (he.net)
           "2001:470:1:fa1::/64",      # amsterdam external (he.net)
           "82.199.86.96/27",          # amsterdam external (equinix)
-          # "/64",                     # amsterdam external (equinix)
+          "2001:4d78:500:5e3::/64",   # amsterdam external (equinix)
           "10.0.64.0/20",             # dublin internal
           "184.104.226.96/27",        # dublin external (he.net)
           "2001:470:1:b3b::/64",      # dublin external (he.net)