X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/38e72bf132905c9f1ad45800dd6dbf94df987415..881f5efebda46c56b711e3decb940432c513a01e:/src/openstreetmap.js diff --git a/src/openstreetmap.js b/src/openstreetmap.js index e815a94..bd04075 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 @@ -146,12 +166,16 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), TXT("@", "_globalsign-domain-verification=ps00GlW1BzY9c2_cwH_pFqRkvzZyaCVZ-3RLssRG6S"), TXT("@", "_globalsign-domain-verification=W0buKB5ZmL-VwwHw2oQyQImk3I1q3hSemf2qmB1hjP"), + // Facebook Business domain verification + TXT("@", "facebook-domain-verification=j5hix5i8r0kortfugqf2p9wx9x9by0"), + // Delegate MTA-STS policy for subdomains CNAME("_mta-sts.messages", QUALIFY("_mta-sts")), 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 +301,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 @@ -306,12 +332,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("scorch", SCORCH_IPV6), A("rhaegal", RHAEGAL_IPV4), + AAAA("rhaegal", RHAEGAL_IPV6), A("palulukon", PALULUKON_IPV4), - A("pyrene", PYRENE_IPV4), - 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), @@ -339,6 +366,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("ironbelly", IRONBELLY_IPV6), A("logstash", IRONBELLY_IPV4), AAAA("logstash", IRONBELLY_IPV6), + A("tiler", IRONBELLY_IPV4), + AAAA("tiler", IRONBELLY_IPV6), + A("us-imagery", IRONBELLY_IPV4), + AAAA("us-imagery", IRONBELLY_IPV6), A("ironbelly.ams", IRONBELLY_INTERNAL), A("ironbelly.oob", IRONBELLY_OOB), @@ -408,14 +439,16 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Foundation server A("ridley", RIDLEY_IPV4), - A("otrs", RIDLEY_IPV4), A("blog", RIDLEY_IPV4), A("foundation", RIDLEY_IPV4), - A("hot", RIDLEY_IPV4), - A("dmca", RIDLEY_IPV4), A("ridley.ucl", RIDLEY_INTERNAL), A("ridley.oob", RIDLEY_OOB), + A("staging.blog", FUME_IPV4), + AAAA("staging.blog", FUME_IPV6), + A("birthday20", FUME_IPV4), + AAAA("birthday20", FUME_IPV6), + // Matomo server A("smaug", SMAUG_IPV4), @@ -429,36 +462,34 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Imagery servers - A("draco", DRACO_IPV4), - A("draco.ucl", DRACO_INTERNAL), - A("draco.oob", DRACO_OOB), - A("kessie", KESSIE_IPV4), AAAA("kessie", KESSIE_IPV6), - A("agri", KESSIE_IPV4, TTL("1h")), - AAAA("agri", KESSIE_IPV6, TTL("1h")), - A("a.agri", KESSIE_IPV4, TTL("1h")), - AAAA("a.agri", KESSIE_IPV6, TTL("1h")), - A("b.agri", KESSIE_IPV4, TTL("1h")), - AAAA("b.agri", KESSIE_IPV6, TTL("1h")), - A("c.agri", KESSIE_IPV4, TTL("1h")), - AAAA("c.agri", KESSIE_IPV6, TTL("1h")), - A("os", KESSIE_IPV4, TTL("1h")), - AAAA("os", KESSIE_IPV6, TTL("1h")), - A("a.os", KESSIE_IPV4, TTL("1h")), - AAAA("a.os", KESSIE_IPV6, TTL("1h")), - A("b.os", KESSIE_IPV4, TTL("1h")), - AAAA("b.os", KESSIE_IPV6, TTL("1h")), - A("c.os", KESSIE_IPV4, TTL("1h")), - AAAA("c.os", KESSIE_IPV6, TTL("1h")), + A("agri", KESSIE_IPV4), + AAAA("agri", KESSIE_IPV6), + A("a.agri", KESSIE_IPV4), + AAAA("a.agri", KESSIE_IPV6), + A("b.agri", KESSIE_IPV4), + AAAA("b.agri", KESSIE_IPV6), + A("c.agri", KESSIE_IPV4), + AAAA("c.agri", KESSIE_IPV6), + A("os", KESSIE_IPV4), + AAAA("os", KESSIE_IPV6), + A("a.os", KESSIE_IPV4), + AAAA("a.os", KESSIE_IPV6), + A("b.os", KESSIE_IPV4), + AAAA("b.os", KESSIE_IPV6), + A("c.os", KESSIE_IPV4), + AAAA("c.os", KESSIE_IPV6), A("kessie.oob", KESSIE_OOB), - // Prometheus server + // Prometheus server and munin redirect A("stormfly-03", STORMFLY03_IPV4), AAAA("stormfly-03", STORMFLY03_IPV6), A("prometheus", STORMFLY03_IPV4), AAAA("prometheus", STORMFLY03_IPV6), + A("munin", STORMFLY03_IPV4), + AAAA("munin", STORMFLY03_IPV6), A("stormfly-03.oob", STORMFLY03_OOB), // Management server @@ -478,13 +509,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("idris.dub", IDRIS_INTERNAL), A("idris.oob", IDRIS_OOB), - // Forum server - - A("clifford", CLIFFORD_IPV4), - A("forum", CLIFFORD_IPV4), - A("clifford.ucl", CLIFFORD_INTERNAL), - A("clifford.oob", CLIFFORD_OOB), - // KVMs A("kvm1.ucl", KVM1_INTERNAL), @@ -532,12 +556,17 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("irc", NAGA_IPV6), A("blogs", NAGA_IPV4), AAAA("blogs", NAGA_IPV6), - A("munin", NAGA_IPV4), - AAAA("munin", NAGA_IPV6), A("welcome", NAGA_IPV4), AAAA("welcome", NAGA_IPV6), A("operations", NAGA_IPV4), AAAA("operations", NAGA_IPV6), + A("hot", NAGA_IPV4), + AAAA("hot", NAGA_IPV6), + A("dmca", NAGA_IPV4), + AAAA("dmca", NAGA_IPV6), + A("otrs", NAGA_IPV4), + AAAA("otrs", NAGA_IPV6), + A("naga.dub", NAGA_INTERNAL), A("naga.oob", NAGA_OOB), @@ -552,12 +581,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Overpass server - A("gorwen", GORWEN_IPV4), - AAAA("gorwen", GORWEN_IPV6), - A("query", GORWEN_IPV4), - AAAA("query", GORWEN_IPV6), - A("gorwen.dub", GORWEN_INTERNAL), - A("gorwen.oob", GORWEN_OOB), + A("grisu", GRISU_IPV4), + AAAA("grisu", GRISU_IPV6), + A("query", GRISU_IPV4), + AAAA("query", GRISU_IPV6), + A("grisu.dub", GRISU_INTERNAL), + A("grisu.oob", GRISU_OOB), // GPS tile server @@ -584,59 +613,16 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Tile cache servers - A("gorynych", GORYNYCH_IPV4), - AAAA("gorynych", GORYNYCH_IPV6), - A("trogdor", TROGDOR_IPV4), - A("trogdor.oob", TROGDOR_OOB), A("ridgeback", RIDGEBACK_IPV4), A("ridgeback.oob", RIDGEBACK_OOB), - A("nepomuk", NEPOMUK_IPV4), - AAAA("nepomuk", NEPOMUK_IPV6), - A("viserion", VISERION_IPV4), - AAAA("viserion", VISERION_IPV6), - A("drogon", DROGON_IPV4), - AAAA("drogon", DROGON_IPV6), - A("saphira", SAPHIRA_IPV4), - AAAA("saphira", SAPHIRA_IPV6), - A("toothless", TOOTHLESS_IPV4), - AAAA("toothless", TOOTHLESS_IPV6), A("angor", ANGOR_IPV4), - // AAAA("angor", ANGOR_IPV6), + AAAA("angor", ANGOR_IPV6), A("ladon", LADON_IPV4), AAAA("ladon", LADON_IPV6), A("ascalon", ASCALON_IPV4), - A("takhisis", TAKHISIS_IPV4), - AAAA("takhisis", TAKHISIS_IPV6), A("neak", NEAK_IPV4), A("meraxes", MERAXES_IPV4), 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("noquiklos", NOQUIKLOS_IPV4), - A("noquiklos.ucl", NOQUIKLOS_INTERNAL), - A("noquiklos.oob", NOQUIKLOS_OOB), - - A("pummelzacken", PUMMELZACKEN_IPV4), - A("pummelzacken.ucl", PUMMELZACKEN_INTERNAL), - A("pummelzacken.oob", PUMMELZACKEN_OOB), - - A("sarel", SAREL_IPV4), - A("sarel.ucl", SAREL_INTERNAL), - A("sarel.oob", SAREL_OOB), - // Temporary name for discourse fluxbb import test - A("forum-import-test", SAREL_IPV4), - - A("tabaluga", TABALUGA_IPV4), - AAAA("tabaluga", TABALUGA_IPV6), - A("tabaluga.ams", TABALUGA_INTERNAL), - A("tabaluga.oob", TABALUGA_OOB), // Discourse server ("community") @@ -648,13 +634,25 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("community", JAKELONG_IPV6), AAAA("communities", JAKELONG_IPV6), AAAA("c", JAKELONG_IPV6), + CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."), + TXT("community", "google-site-verification=hQ8GZyj4KwnPqAX2oAzpbLrh6I5dfR08PSdL3icVkfg"), + A("forum", JAKELONG_IPV4), + AAAA("forum", JAKELONG_IPV6), A("jakelong.dub", JAKELONG_INTERNAL), A("jakelong.oob", JAKELONG_OOB), - CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."), - // 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), // Uptime site at StatusCake