From: Grant Slater Date: Sun, 16 Feb 2025 09:09:04 +0000 (+0100) Subject: Fix SPF for osmfoundation (otrs). Remove record duplication X-Git-Url: https://git.openstreetmap.org./dns.git/commitdiff_plain/3ea4c0baca1e065b907bacecbf59041b6caa24a3 Fix SPF for osmfoundation (otrs). Remove record duplication --- diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 26a2b61..bae9c42 100644 --- 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 cbb22d2..642e584 100644 --- 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" ] }),