From: Tom Hughes <tom@compton.nu>
Date: Sun, 11 Jun 2023 09:26:19 +0000 (+0100)
Subject: Remove cogent addresses from SPF records
X-Git-Url: https://git.openstreetmap.org./dns.git/commitdiff_plain/9549d65413898928a01ad246476b013ebd64f51f

Remove cogent addresses from SPF records
---

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index cb5e1a1..ac420a4 100644
--- 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 79e4eef..ad5eb3f 100644
--- 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"