Fix SPF for osmfoundation (otrs). Remove record duplication

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 26a2b61cfa4b8baf1b052ababbcee4681b33964e..bae9c426e4b46a274a5607b6b5267c022c48ff64 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -60,20 +60,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     label: "messages",
     parts: [
       "v=spf1",
-      "ip4:184.104.226.98",         // fafnir ipv4 (he.net)
-      "ip6:2001:470:1:b3b::2",      // fafnir ipv6 (he.net)
-      "ip4:87.252.214.98",          // fafnir ipv4 (equinix)
-      "ip6:2001:4d78:fe03:1c::2",   // fafnir ipv6 (equinix)
-      "ip4:193.60.236.0/24",        // ucl external
-      "ip4:82.199.86.96/27",        // amsterdam external (equinix)
-      "ip6:2001:4d78:500:5e3::/64", // amsterdam external (equinix)
-      "ip4:87.252.214.96/27",       // dublin external (equinix)
-      "ip6:2001:4d78:fe03:1c::/64", // dublin external (equinix)
-      "ip4:184.104.179.128/27",     // amsterdam external (he.net)
-      "ip6:2001:470:1:fa1::/64",    // amsterdam external (he.net)
-      "ip4:184.104.226.96/27",      // dublin external (he.net)
-      "ip6:2001:470:1:b3b::/64",    // dublin external (he.net)
-      "mx",                         // safety net if we change mx
+      "include:openstreetmap.org",  // main openstreetmap.org spf record
       "-all"
     ]
   }),
@@ -82,20 +69,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     label: "noreply",
     parts: [
       "v=spf1",
-      "ip4:184.104.226.98",         // fafnir ipv4 (he.net)
-      "ip6:2001:470:1:b3b::2",      // fafnir ipv6 (he.net)
-      "ip4:87.252.214.98",          // fafnir ipv4 (equinix)
-      "ip6:2001:4d78:fe03:1c::2",   // fafnir ipv6 (equinix)
-      "ip4:193.60.236.0/24",        // ucl external
-      "ip4:82.199.86.96/27",        // amsterdam external (equinix)
-      "ip6:2001:4d78:500:5e3::/64", // amsterdam external (equinix)
-      "ip4:87.252.214.96/27",       // dublin external (equinix)
-      "ip6:2001:4d78:fe03:1c::/64", // dublin external (equinix)
-      "ip4:184.104.179.128/27",     // amsterdam external (he.net)
-      "ip6:2001:470:1:fa1::/64",    // amsterdam external (he.net)
-      "ip4:184.104.226.96/27",      // dublin external (he.net)
-      "ip6:2001:470:1:b3b::/64",    // dublin external (he.net)
-      "mx",                         // safety net if we change mx
+      "include:openstreetmap.org",  // main openstreetmap.org spf record
       "-all"
     ]
   }),
@@ -104,20 +78,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     label: "otrs",
     parts: [
       "v=spf1",
-      "ip4:184.104.226.98",         // fafnir ipv4 (he.net)
-      "ip6:2001:470:1:b3b::2",      // fafnir ipv6 (he.net)
-      "ip4:87.252.214.98",          // fafnir ipv4 (equinix)
-      "ip6:2001:4d78:fe03:1c::2",   // fafnir ipv6 (equinix)
-      "ip4:193.60.236.0/24",        // ucl external
-      "ip4:82.199.86.96/27",        // amsterdam external (equinix)
-      "ip6:2001:4d78:500:5e3::/64", // amsterdam external (equinix)
-      "ip4:87.252.214.96/27",       // dublin external (equinix)
-      "ip6:2001:4d78:fe03:1c::/64", // dublin external (equinix)
-      "ip4:184.104.179.128/27",     // amsterdam external (he.net)
-      "ip6:2001:470:1:fa1::/64",    // amsterdam external (he.net)
-      "ip4:184.104.226.96/27",      // dublin external (he.net)
-      "ip6:2001:470:1:b3b::/64",    // dublin external (he.net)
-      "mx",                         // safety net if we change mx
+      "include:openstreetmap.org",  // main openstreetmap.org spf record
       "-all"
     ]
   }),
@@ -126,20 +87,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     label: "community",
     parts: [
       "v=spf1",
-      "ip4:184.104.226.98",         // fafnir ipv4 (he.net)
-      "ip6:2001:470:1:b3b::2",      // fafnir ipv6 (he.net)
-      "ip4:87.252.214.98",          // fafnir ipv4 (equinix)
-      "ip6:2001:4d78:fe03:1c::2",   // fafnir ipv6 (equinix)
-      "ip4:193.60.236.0/24",        // ucl external
-      "ip4:82.199.86.96/27",        // amsterdam external (equinix)
-      "ip6:2001:4d78:500:5e3::/64", // amsterdam external (equinix)
-      "ip4:87.252.214.96/27",       // dublin external (equinix)
-      "ip6:2001:4d78:fe03:1c::/64", // dublin external (equinix)
-      "ip4:184.104.179.128/27",     // amsterdam external (he.net)
-      "ip6:2001:470:1:fa1::/64",    // amsterdam external (he.net)
-      "ip4:184.104.226.96/27",      // dublin external (he.net)
-      "ip6:2001:470:1:b3b::/64",    // dublin external (he.net)
-      "mx",                         // safety net if we change mx
+      "include:openstreetmap.org",  // main openstreetmap.org spf record
       "-all"
     ]
   }),
@@ -148,20 +96,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     label: "supporting",
     parts: [
       "v=spf1",
-      "ip4:184.104.226.98",         // fafnir ipv4 (he.net)
-      "ip6:2001:470:1:b3b::2",      // fafnir ipv6 (he.net)
-      "ip4:87.252.214.98",          // fafnir ipv4 (equinix)
-      "ip6:2001:4d78:fe03:1c::2",   // fafnir ipv6 (equinix)
-      "ip4:193.60.236.0/24",        // ucl external
-      "ip4:82.199.86.96/27",        // amsterdam external (equinix)
-      "ip6:2001:4d78:500:5e3::/64", // amsterdam external (equinix)
-      "ip4:87.252.214.96/27",       // dublin external (equinix)
-      "ip6:2001:4d78:fe03:1c::/64", // dublin external (equinix)
-      "ip4:184.104.179.128/27",     // amsterdam external (he.net)
-      "ip6:2001:470:1:fa1::/64",    // amsterdam external (he.net)
-      "ip4:184.104.226.96/27",      // dublin external (he.net)
-      "ip6:2001:470:1:b3b::/64",    // dublin external (he.net)
-      "mx",                         // safety net if we change mx
+      "include:openstreetmap.org",  // main openstreetmap.org spf record
       "-all"
     ]
   }),

diff --git a/src/osmfoundation.js b/src/osmfoundation.js
index cbb22d22794f01a7676f9befed1ea3bd5928cd0e..642e58455f2b82432c404c50beeecd82a5f21dc7 100644 (file)
--- a/src/osmfoundation.js
+++ b/src/osmfoundation.js
@@ -31,13 +31,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
       "v=spf1",
       "include:mailbox.org",     // mailbox.org
       "include:_spf.google.com", // Google GSuite
-      "ip4:184.104.226.98",      // fafnir ipv4
-      "ip6:2001:470:1:b3b::2",   // fafnir ipv6
-      "ip4:193.60.236.0/24",     // ucl 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
+      "include:openstreetmap.org",  // main openstreetmap.org spf record
       "-all"
     ]
   }),
@@ -46,13 +40,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     label: "wiki",
     parts: [
       "v=spf1",
-      "ip4:184.104.226.98",      // fafnir ipv4
-      "ip6:2001:470:1:b3b::2",   // fafnir ipv6
-      "ip4:193.60.236.0/24",     // ucl 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
+      "include:openstreetmap.org",  // main openstreetmap.org spf record
       "-all"
     ]
   }),