X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/9d75c3094b0f1e6d7637787b3063e808f0e79155..a3c773e31e79f3bc336ba3d2a94be279cc335e33:/src/openstreetmap.js diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 1473719..e3c0918 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -16,15 +16,21 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), ], }), - // Use shenron as the MX host + // Mail service MX("@", 10, QUALIFY("a.mx")), MX("messages", 10, QUALIFY("a.mx")), MX("noreply", 10, QUALIFY("a.mx")), MX("otrs", 10, QUALIFY("a.mx")), MX("community", 10, QUALIFY("a.mx")), - A("a.mx", SHENRON_IPV4), - AAAA("a.mx", SHENRON_IPV6), + MX("supporting", 10, QUALIFY("a.mx")), + + A("a.mx", FAFNIR_IPV4), + AAAA("a.mx", FAFNIR_IPV6), + A("mail", FAFNIR_IPV4), + AAAA("mail", FAFNIR_IPV6), + A("mta-sts", FAFNIR_IPV4), + AAAA("mta-sts", FAFNIR_IPV6), // Publish SPF records indicating that only shenron sends mail @@ -36,6 +42,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), "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 "-all" ] @@ -49,6 +60,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), "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 "-all" ] @@ -62,6 +78,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), "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 "-all" ] @@ -75,6 +96,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), "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 "-all" ] @@ -88,6 +114,29 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), "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 + "-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 "-all" ] @@ -117,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 @@ -223,10 +276,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Nominatim servers - A("pummelzacken", PUMMELZACKEN_IPV4), - A("pummelzacken.ucl", PUMMELZACKEN_INTERNAL), - A("pummelzacken.oob", PUMMELZACKEN_OOB), - A("dulcy", DULCY_IPV4), AAAA("dulcy", DULCY_IPV6), A("dulcy.ams", DULCY_INTERNAL), @@ -241,16 +290,23 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("stormfly-04", STORMFLY04_IPV6), A("stormfly-04.oob", STORMFLY04_OOB), + A("vhagar", VHAGAR_IPV4), + AAAA("vhagar", VHAGAR_IPV6), + A("vhagar.ams", VHAGAR_INTERNAL), + A("vhagar.oob", VHAGAR_OOB), + CNAME("nominatim", "nominatim.geo.openstreetmap.org."), CNAME("qgis.nominatim", "nominatim.geo.openstreetmap.org."), CNAME("qa-tile.nominatim", "longma.openstreetmap.org."), // Taginfo server - A("grindtooth", GRINDTOOTH_IPV4), - A("taginfo", GRINDTOOTH_IPV4, TTL("10m")), - 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 @@ -279,9 +335,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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), @@ -293,65 +349,52 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("necrosan", NECROSAN_IPV4), AAAA("necrosan", NECROSAN_IPV6), - CNAME("tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")), - CNAME("a.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")), - CNAME("b.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")), - CNAME("c.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")), + CNAME("tile", "dualstack.n.sni.global.fastly.net."), + CNAME("a.tile", "dualstack.n.sni.global.fastly.net."), + CNAME("b.tile", "dualstack.n.sni.global.fastly.net."), + CNAME("c.tile", "dualstack.n.sni.global.fastly.net."), A("render", CULEBRE_IPV4), A("render", NIDHOGG_IPV4), AAAA("render", CULEBRE_IPV6), AAAA("render", NIDHOGG_IPV6), - // Services machine + // Site gateways A("ironbelly", IRONBELLY_IPV4), AAAA("ironbelly", IRONBELLY_IPV6), - A("backup", IRONBELLY_IPV4, TTL("10m")), - AAAA("backup", IRONBELLY_IPV6, TTL("10m")), - A("planet", IRONBELLY_IPV4, TTL("10m")), - AAAA("planet", IRONBELLY_IPV6, TTL("10m")), A("logstash", IRONBELLY_IPV4), AAAA("logstash", IRONBELLY_IPV6), + A("tiler", IRONBELLY_IPV4), + AAAA("tiler", IRONBELLY_IPV6), A("ironbelly.ams", IRONBELLY_INTERNAL), A("ironbelly.oob", IRONBELLY_OOB), - A("norbert", NORBERT_IPV4), - AAAA("norbert", NORBERT_IPV6), - // A("backup", NORBERT_IPV4, TTL("10m")), - // AAAA("backup", NORBERT_IPV6, TTL("10m")), - // A("planet", NORBERT_IPV4, TTL("10m")), - // AAAA("planet", NORBERT_IPV6, TTL("10m")), - A("norbert.ams", NORBERT_INTERNAL), - A("norbert.oob", NORBERT_OOB), - A("fafnir", FAFNIR_IPV4), AAAA("fafnir", FAFNIR_IPV6), - // A("backup", FAFNIR_IPV4, TTL("10m")), - // AAAA("backup", FAFNIR_IPV6, TTL("10m")), - // A("planet", FAFNIR_IPV4, TTL("10m")), - // AAAA("planet", FAFNIR_IPV6, TTL("10m")), A("fafnir.dub", FAFNIR_INTERNAL), A("fafnir.oob", FAFNIR_OOB), + // Planet servers + + A("norbert", NORBERT_IPV4), + AAAA("norbert", NORBERT_IPV6), + A("backup", NORBERT_IPV4), + AAAA("backup", NORBERT_IPV6), + A("planet", NORBERT_IPV4), + AAAA("planet", NORBERT_IPV6), + A("norbert.ams", NORBERT_INTERNAL), + A("norbert.oob", NORBERT_OOB), + A("horntail", HORNTAIL_IPV4), AAAA("horntail", HORNTAIL_IPV6), - // A("backup", HORNTAIL_IPV4, TTL("10m")), - // AAAA("backup", HORNTAIL_IPV6, TTL("10m")), - // A("planet", HORNTAIL_IPV4, TTL("10m")), - // AAAA("planet", HORNTAIL_IPV6, TTL("10m")), + // A("backup", HORNTAIL_IPV4), + // AAAA("backup", HORNTAIL_IPV6), + // A("planet", HORNTAIL_IPV4), + // AAAA("planet", HORNTAIL_IPV6), A("horntail.dub", HORNTAIL_INTERNAL), A("horntail.oob", HORNTAIL_OOB), - A("grisu", GRISU_IPV4), - AAAA("grisu", GRISU_IPV6), - // A("backup", GRISU_IPV4, TTL("10m")), - // AAAA("backup", GRISU_IPV6, TTL("10m")), - // A("planet", GRISU_IPV4, TTL("10m")), - // AAAA("planet", GRISU_IPV6, TTL("10m")), - A("grisu.bm", GRISU_INTERNAL), - A("grisu.oob", GRISU_OOB), - // Database servers A("snap-01.ams", SNAP01_INTERNAL), @@ -369,9 +412,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("eddie.ucl", EDDIE_INTERNAL), A("eddie.oob", EDDIE_OOB), - A("katla.bm", KATLA_INTERNAL), - A("katla.oob", KATLA_OOB), - // Development server with wildcard alias for user sites A("faffy", FAFFY_IPV4), @@ -399,8 +439,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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), @@ -409,7 +447,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("smaug", SMAUG_IPV4), AAAA("smaug", SMAUG_IPV6), A("matomo", SMAUG_IPV4), + AAAA("matomo", SMAUG_IPV6), A("piwik", SMAUG_IPV4), + AAAA("piwik", SMAUG_IPV6), A("smaug.dub", SMAUG_INTERNAL), A("smaug.oob", SMAUG_OOB), @@ -443,8 +483,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("stormfly-03", STORMFLY03_IPV4), AAAA("stormfly-03", STORMFLY03_IPV6), - A("prometheus", STORMFLY03_IPV4, TTL("10m")), - AAAA("prometheus", STORMFLY03_IPV6, TTL("10m")), + A("prometheus", STORMFLY03_IPV4), + AAAA("prometheus", STORMFLY03_IPV6), A("stormfly-03.oob", STORMFLY03_OOB), // Management server @@ -464,13 +504,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, TTL("10m")), - A("clifford.ucl", CLIFFORD_INTERNAL), - A("clifford.oob", CLIFFORD_OOB), - // KVMs A("kvm1.ucl", KVM1_INTERNAL), @@ -501,10 +534,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("shenron", SHENRON_IPV4), AAAA("shenron", SHENRON_IPV6), - A("mail", SHENRON_IPV4), - AAAA("mail", SHENRON_IPV6), - A("mta-sts", SHENRON_IPV4), - AAAA("mta-sts", SHENRON_IPV6), A("lists", SHENRON_IPV4), AAAA("lists", SHENRON_IPV6), A("help", SHENRON_IPV4), @@ -524,102 +553,70 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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("naga.dub", NAGA_INTERNAL), A("naga.oob", NAGA_OOB), // Wiki servers - A("tabaluga", TABALUGA_IPV4), - AAAA("tabaluga", TABALUGA_IPV6), - A("wiki", TABALUGA_IPV4, TTL("10m")), - AAAA("wiki", TABALUGA_IPV6, TTL("10m")), - A("tabaluga.ams", TABALUGA_INTERNAL), - A("tabaluga.oob", TABALUGA_OOB), + A("konqi", KONQI_IPV4), + AAAA("konqi", KONQI_IPV6), + A("wiki", KONQI_IPV4), + AAAA("wiki", KONQI_IPV6), + A("konqi.dub", KONQI_INTERNAL), + A("konqi.oob", KONQI_OOB), // Overpass server A("gorwen", GORWEN_IPV4), AAAA("gorwen", GORWEN_IPV6), - A("query", GORWEN_IPV4, TTL("10m")), - AAAA("query", GORWEN_IPV6, TTL("10m")), + A("query", GORWEN_IPV4), + AAAA("query", GORWEN_IPV6), A("gorwen.dub", GORWEN_INTERNAL), A("gorwen.oob", GORWEN_OOB), // GPS tile server - A("noquiklos", NOQUIKLOS_IPV4), - A("gps-tile", NOQUIKLOS_IPV4), - A("a.gps-tile", NOQUIKLOS_IPV4), - A("b.gps-tile", NOQUIKLOS_IPV4), - A("c.gps-tile", NOQUIKLOS_IPV4), - A("gps.tile", NOQUIKLOS_IPV4), - A("gps-a.tile", NOQUIKLOS_IPV4), - A("gps-b.tile", NOQUIKLOS_IPV4), - A("gps-c.tile", NOQUIKLOS_IPV4), - A("noquiklos.ucl", NOQUIKLOS_INTERNAL), - A("noquiklos.oob", NOQUIKLOS_OOB), + A("muirdris", MUIRDRIS_IPV4), + AAAA("muirdris", MUIRDRIS_IPV6), + A("gps-tile", MUIRDRIS_IPV4), + AAAA("gps-tile", MUIRDRIS_IPV6), + A("a.gps-tile", MUIRDRIS_IPV4), + AAAA("a.gps-tile", MUIRDRIS_IPV6), + A("b.gps-tile", MUIRDRIS_IPV4), + AAAA("b.gps-tile", MUIRDRIS_IPV6), + A("c.gps-tile", MUIRDRIS_IPV4), + AAAA("c.gps-tile", MUIRDRIS_IPV6), + A("gps.tile", MUIRDRIS_IPV4), + AAAA("gps.tile", MUIRDRIS_IPV6), + A("gps-a.tile", MUIRDRIS_IPV4), + AAAA("gps-a.tile", MUIRDRIS_IPV6), + A("gps-b.tile", MUIRDRIS_IPV4), + AAAA("gps-b.tile", MUIRDRIS_IPV6), + A("gps-c.tile", MUIRDRIS_IPV4), + AAAA("gps-c.tile", MUIRDRIS_IPV6), + A("muirdris.dub", MUIRDRIS_INTERNAL), + A("muirdris.oob", MUIRDRIS_OOB), // 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.dub", DRIBBLE_INTERNAL), - A("dribble.oob", DRIBBLE_OOB), - - A("eustace", EUSTACE_IPV4), - A("eustace.ucl", EUSTACE_INTERNAL), - A("eustace.oob", EUSTACE_OOB), - - A("konqi", KONQI_IPV4), - AAAA("konqi", KONQI_IPV6), - A("konqi.dub", KONQI_INTERNAL), - A("konqi.oob", KONQI_OOB), - - A("muirdris", MUIRDRIS_IPV4), - AAAA("muirdris", MUIRDRIS_IPV6), - A("muirdris.dub", MUIRDRIS_INTERNAL), - A("muirdris.oob", MUIRDRIS_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("vhagar", VHAGAR_IPV4), - AAAA("vhagar", VHAGAR_IPV6), - A("vhagar.dub", VHAGAR_INTERNAL), - A("vhagar.oob", VHAGAR_OOB), // Discourse server ("community") @@ -627,23 +624,38 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("jakelong", JAKELONG_IPV6), A("community", JAKELONG_IPV4), A("communities", JAKELONG_IPV4), + A("c", JAKELONG_IPV4), 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), - // Uptime site at StatusCake + // Spare servers - CNAME("uptime", "uptimessl-new.statuscake.com."), + A("fume", FUME_IPV4), + AAAA("fume", FUME_IPV6), + A("fume.dub", FUME_INTERNAL), + A("fume.oob", FUME_OOB), - // Custom Domain for https://github.com/osmfoundation/welcome-mat/ + A("grisu", GRISU_IPV4), + AAAA("grisu", GRISU_IPV6), + A("grisu.dub", GRISU_INTERNAL), + A("grisu.oob", GRISU_OOB), + + // Uptime site at StatusCake - CNAME("welcome", "osmfoundation.github.io."), + CNAME("uptime", "uptimessl-new.statuscake.com."), // Dynamic DNS records