X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/31e0dae2761116813dc79257035a3da7e09923ee..2c2dded98c7d488962c7554ff681542f3a9fb29c:/src/openstreetmap.js diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 0750308..34fe18f 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -23,6 +23,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), MX("noreply", 10, QUALIFY("a.mx")), MX("otrs", 10, QUALIFY("a.mx")), MX("community", 10, QUALIFY("a.mx")), + MX("supporting", 10, QUALIFY("a.mx")), + A("a.mx", FAFNIR_IPV4), AAAA("a.mx", FAFNIR_IPV6), A("mail", FAFNIR_IPV4), @@ -41,8 +43,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 @@ -59,8 +61,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 @@ -77,8 +79,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 @@ -95,8 +97,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 @@ -113,8 +115,26 @@ 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 + "-all" + ] + }), + + SPF_BUILDER({ + label: "supporting", + parts: [ + "v=spf1", + "ip4:212.110.172.32", // shenron ipv4 + "ip6:2001:41c9:1:400::32", // shenron ipv6 + "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 "mx", // safety net if we change mx @@ -152,6 +172,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), CNAME("_mta-sts.noreply", QUALIFY("_mta-sts")), CNAME("_mta-sts.otrs", QUALIFY("_mta-sts")), CNAME("_mta-sts.community", QUALIFY("_mta-sts")), + CNAME("_mta-sts.supporting", QUALIFY("_mta-sts")), // Google postmaster tools verification @@ -277,10 +298,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Taginfo server - A("grindtooth", GRINDTOOTH_IPV4), - A("taginfo", GRINDTOOTH_IPV4), - A("grindtooth.ucl", GRINDTOOTH_INTERNAL), - A("grindtooth.oob", GRINDTOOTH_OOB), + A("dribble", DRIBBLE_IPV4), + A("taginfo", DRIBBLE_IPV4), + AAAA("dribble", DRIBBLE_IPV6), + AAAA("taginfo", DRIBBLE_IPV6), + A("dribble.ams", DRIBBLE_INTERNAL), + A("dribble.oob", DRIBBLE_OOB), // Tile servers @@ -313,6 +336,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("pyrene", PYRENE_IPV6), A("pyrene.oob", PYRENE_OOB), + A("piasa", PIASA_IPV4), + AAAA("piasa", PIASA_IPV6), + A("piasa.oob", PIASA_OOB), + A("bowser", BOWSER_IPV4), A("balerion", BALERION_IPV4), @@ -411,7 +438,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("otrs", RIDLEY_IPV4), A("blog", RIDLEY_IPV4), A("foundation", RIDLEY_IPV4), - A("dmca", RIDLEY_IPV4), A("ridley.ucl", RIDLEY_INTERNAL), A("ridley.oob", RIDLEY_OOB), @@ -532,6 +558,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("operations", NAGA_IPV6), A("hot", NAGA_IPV4), AAAA("hot", NAGA_IPV6), + A("dmca", NAGA_IPV4), + AAAA("dmca", NAGA_IPV6), A("naga.dub", NAGA_INTERNAL), A("naga.oob", NAGA_OOB), @@ -598,18 +626,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("meraxes", MERAXES_IPV6), A("firnen", FIRNEN_IPV4), - // Spare - - A("dribble", DRIBBLE_IPV4), - AAAA("dribble", DRIBBLE_IPV6), - A("dribble.ams", DRIBBLE_INTERNAL), - A("dribble.oob", DRIBBLE_OOB), - - A("tabaluga", TABALUGA_IPV4), - AAAA("tabaluga", TABALUGA_IPV6), - A("tabaluga.ams", TABALUGA_INTERNAL), - A("tabaluga.oob", TABALUGA_OOB), - // Discourse server ("community") A("jakelong", JAKELONG_IPV4), @@ -627,9 +643,23 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("jakelong.dub", JAKELONG_INTERNAL), A("jakelong.oob", JAKELONG_OOB), - // Donation site + // Donation site and new OSMF crm site A("donate", RIDLEY_IPV4), + A("support", RIDLEY_IPV4), + A("supporting", RIDLEY_IPV4), + + // Spare servers + + A("fume", FUME_IPV4), + AAAA("fume", FUME_IPV6), + A("fume.dub", FUME_INTERNAL), + A("fume.oob", FUME_OOB), + + A("grisu", GRISU_IPV4), + AAAA("grisu", GRISU_IPV6), + A("grisu.dub", GRISU_INTERNAL), + A("grisu.oob", GRISU_OOB), // Uptime site at StatusCake