X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/6590c55ab4cb992dd612f3ee0deb5a0cbf9b91fb..108f25e0b01a8e7b43c931a197fb892da298f3d6:/src/osmfoundation.js diff --git a/src/osmfoundation.js b/src/osmfoundation.js index 89e71e0..70c1d87 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" ] }), @@ -103,48 +91,27 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Main web server and it's aliases - A("@", RIDLEY_IPV4), - A("www", RIDLEY_IPV4), - A("wiki", RIDLEY_IPV4), - A("blog", RIDLEY_IPV4), - - A("staging.blog", FUME_IPV4), - AAAA("staging.blog", FUME_IPV6), - - A("crm", RIDLEY_IPV4), - A("join", RIDLEY_IPV4), - A("support", RIDLEY_IPV4), - A("supporting", RIDLEY_IPV4), - A("donate", RIDLEY_IPV4), - - A("board", RIDLEY_IPV4), - A("dwg", RIDLEY_IPV4), - A("mwg", RIDLEY_IPV4), - A("operations", NAGA_IPV4), - AAAA("operations", NAGA_IPV6), - - // HTTPS / SVCB records - HTTPS("www", 1, ".", "alpn=h2"), - HTTPS("wiki", 1, ".", "alpn=h2"), - HTTPS("blog", 1, ".", "alpn=h2"), - HTTPS("staging.blog", 1, ".", "alpn=h2"), - HTTPS("crm", 1, ".", "alpn=h2"), - HTTPS("join", 1, ".", "alpn=h2"), - HTTPS("support", 1, ".", "alpn=h2"), - HTTPS("supporting", 1, ".", "alpn=h2"), - HTTPS("donate", 1, ".", "alpn=h2"), - HTTPS("board", 1, ".", "alpn=h2"), - HTTPS("dwg", 1, ".", "alpn=h2"), - HTTPS("mwg", 1, ".", "alpn=h2"), - HTTPS("operations", 1, ".", "alpn=h2"), + osm_web_service("@", "ridley"), + osm_web_service("www", "ridley"), + osm_web_service("wiki", "ridley"), + osm_web_service("blog", "ridley"), + osm_web_service("crm", "ridley"), + osm_web_service("join", "ridley"), + osm_web_service("support", "ridley"), + osm_web_service("supporting", "ridley"), + osm_web_service("donate", "ridley"), + osm_web_service("board", "ridley"), + osm_web_service("dwg", "ridley"), + osm_web_service("mwg", "ridley"), + osm_web_service("operations", "naga"), // Nextcloud instance CNAME("files", "nextcloud-openstreetmapfoundation.cloud68.systems."), - A("hardware", IDRIS_IPV4), + // Staging Blog + osm_web_service("staging.blog", "tabaluga"), - // HTTPS / SVCB records - HTTPS("hardware", 1, ".", "alpn=h2") + osm_web_service("hardware", "idris"), );