Remove cogent addresses from SPF records

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index cb5e1a1d1fc29183324d7887a2ba734e88d73fe8..ac420a4aa031167718cba02a5aa4da433775cce4 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -41,8 +41,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
       "ip4:184.104.226.98",       // fafnir ipv4
       "ip6:2001:470:1:b3b::2",    // fafnir ipv6
       "ip4:193.60.236.0/24",          // ucl external
-      "ip4:130.117.76.0/27",          // amsterdam external (old)
-      "ip6:2001:978:2:2C::172:0/112", // amsterdam external (old)
       "ip4:184.104.179.128/27",       // amsterdam external
       "ip6:2001:470:1:fa1::/64",      // amsterdam external
       "ip4:184.104.226.96/27",        // dublin external
@@ -61,8 +59,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
       "ip4:184.104.226.98",       // fafnir ipv4
       "ip6:2001:470:1:b3b::2",    // fafnir ipv6
       "ip4:193.60.236.0/24",          // ucl external
-      "ip4:130.117.76.0/27",          // amsterdam external
-      "ip6:2001:978:2:2C::172:0/112", // amsterdam external
+      "ip4:184.104.179.128/27",       // amsterdam external
+      "ip6:2001:470:1:fa1::/64",      // amsterdam external
       "ip4:184.104.226.96/27",        // dublin external
       "ip6:2001:470:1:b3b::/64",      // dublin external
       "mx",                       // safety net if we change mx
@@ -79,8 +77,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
       "ip4:184.104.226.98",       // fafnir ipv4
       "ip6:2001:470:1:b3b::2",    // fafnir ipv6
       "ip4:193.60.236.0/24",          // ucl external
-      "ip4:130.117.76.0/27",          // amsterdam external (old)
-      "ip6:2001:978:2:2C::172:0/112", // amsterdam external (old)
       "ip4:184.104.179.128/27",       // amsterdam external
       "ip6:2001:470:1:fa1::/64",      // amsterdam external
       "ip4:184.104.226.96/27",        // dublin external
@@ -99,8 +95,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
       "ip4:184.104.226.98",       // fafnir ipv4
       "ip6:2001:470:1:b3b::2",    // fafnir ipv6
       "ip4:193.60.236.0/24",          // ucl external
-      "ip4:130.117.76.0/27",          // amsterdam external (old)
-      "ip6:2001:978:2:2C::172:0/112", // amsterdam external (old)
       "ip4:184.104.179.128/27",       // amsterdam external
       "ip6:2001:470:1:fa1::/64",      // amsterdam external
       "ip4:184.104.226.96/27",        // dublin external
@@ -119,8 +113,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
       "ip4:184.104.226.98",       // fafnir ipv4
       "ip6:2001:470:1:b3b::2",    // fafnir ipv6
       "ip4:193.60.236.0/24",          // ucl external
-      "ip4:130.117.76.0/27",          // amsterdam external (old)
-      "ip6:2001:978:2:2C::172:0/112", // amsterdam external (old)
       "ip4:184.104.179.128/27",       // amsterdam external
       "ip6:2001:470:1:fa1::/64",      // amsterdam external
       "ip4:184.104.226.96/27",        // dublin external

diff --git a/src/osmfoundation.js b/src/osmfoundation.js
index 79e4eefb71d99c9c1723ed8b03f9f54fbb8e7454..ad5eb3f84d78a4105df391d2b7ea81a096e9b677 100644 (file)
--- a/src/osmfoundation.js
+++ b/src/osmfoundation.js
@@ -37,8 +37,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
       "ip4:184.104.226.98",       // fafnir ipv4
       "ip6:2001:470:1:b3b::2",    // fafnir ipv6
       "ip4:193.60.236.0/24",          // ucl external
-      "ip4:130.117.76.0/27",          // amsterdam external
-      "ip6:2001:978:2:2C::172:0/112", // amsterdam external
+      "ip4:184.104.179.128/27",       // amsterdam external
+      "ip6:2001:470:1:fa1::/64",      // amsterdam external
       "ip4:184.104.226.96/27",        // dublin external
       "ip6:2001:470:1:b3b::/64",      // dublin external
       "-all"
@@ -52,8 +52,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
       "ip4:184.104.226.98",       // fafnir ipv4
       "ip6:2001:470:1:b3b::2",    // fafnir ipv6
       "ip4:193.60.236.0/24",          // ucl external
-      "ip4:130.117.76.0/27",          // amsterdam external
-      "ip6:2001:978:2:2C::172:0/112", // amsterdam external
+      "ip4:184.104.179.128/27",       // amsterdam external
+      "ip6:2001:470:1:fa1::/64",      // amsterdam external
       "ip4:184.104.226.96/27",        // dublin external
       "ip6:2001:470:1:b3b::/64",      // dublin external
       "-all"