Add new Amsterdam IPv6 addresses to ACLs

[chef.git] / cookbooks / tile / templates / default / apache.erb

diff --git a/cookbooks/tile/templates/default/apache.erb b/cookbooks/tile/templates/default/apache.erb
index 5a2627919923e803d178641ab77505f4bdd75a33..a1c4e1977a40f75d171bc0fc8f03e8a890cc3931 100644 (file)
--- a/cookbooks/tile/templates/default/apache.erb
+++ b/cookbooks/tile/templates/default/apache.erb
@@ -75,18 +75,22 @@
 <% @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
+    # OSM Amsterdam IPv4 (he.net)

     Require ip 184.104.179.128/27
     Require ip 184.104.179.128/27

-    # OSM Amsterdam IPv6
+    # OSM Amsterdam IPv4 (equinix)
+    Require ip 82.199.86.96/27
+    # OSM Amsterdam IPv6 (he.net)

     Require ip 2001:470:1:fa1::/64
     Require ip 2001:470:1:fa1::/64

-    # OSM Dublin IPv4
+    # OSM Amsterdam IPv6 (equinix)
+    Require ip 2001:4d78:500:5e3::/64
+    # OSM Dublin IPv4 (he.net)

     Require ip 184.104.226.96/27
     Require ip 184.104.226.96/27

-    # OSM Dublin IPv6
+    # OSM Dublin IPv4 (equinix)
+    Require ip 87.252.214.96/27
+    # OSM Dublin IPv6 (he.net)

     Require ip 2001:470:1:b3b::/64
     Require ip 2001:470:1:b3b::/64

+    # OSM Dublin IPv6 (equinix)
+    Require ip 2001:4d78:fe03:1c::/64

     # OSM UCL IPv4
     Require ip 193.60.236.0/24
   </LocationMatch>
     # OSM UCL IPv4
     Require ip 193.60.236.0/24
   </LocationMatch>