X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/e5c19ed8d199257e4c86d1d320cf201540702208..a0b012c50e5c2fcefd1921b149d0d8693dba06d3:/src/openstreetmap.js diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 33b1cdb..4f94978 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -34,6 +34,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), "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 "mx", // safety net if we change mx "-all" ] @@ -45,6 +47,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), "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 "mx", // safety net if we change mx "-all" ] @@ -56,6 +60,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), "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 "mx", // safety net if we change mx "-all" ] @@ -67,6 +73,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), "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 "mx", // safety net if we change mx "-all" ] @@ -78,6 +86,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), "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 "mx", // safety net if we change mx "-all" ] @@ -123,134 +133,94 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("spike-01", SPIKE01_IPV4), AAAA("spike-01", SPIKE01_IPV6), - // A("@", SPIKE01_IPV4, TTL("10m")), - // AAAA("@", SPIKE01_IPV6, TTL("10m")), - // A("www", SPIKE01_IPV4, TTL("10m")), - // AAAA("www", SPIKE01_IPV6, TTL("10m")), - // A("api", SPIKE01_IPV4, TTL("10m")), - // AAAA("api", SPIKE01_IPV6, TTL("10m")), - // A("maps", SPIKE01_IPV4, TTL("10m")), - // AAAA("maps", SPIKE01_IPV6, TTL("10m")), - // A("mapz", SPIKE01_IPV4, TTL("10m")), - // AAAA("mapz", SPIKE01_IPV6, TTL("10m")), + // A("@", SPIKE01_IPV4), + // AAAA("@", SPIKE01_IPV6), + // A("www", SPIKE01_IPV4), + // AAAA("www", SPIKE01_IPV6), + // A("api", SPIKE01_IPV4), + // AAAA("api", SPIKE01_IPV6), + // A("maps", SPIKE01_IPV4), + // AAAA("maps", SPIKE01_IPV6), + // A("mapz", SPIKE01_IPV4), + // AAAA("mapz", SPIKE01_IPV6), A("spike-01.dub", SPIKE01_INTERNAL), A("spike-01.oob", SPIKE01_OOB), A("spike-02", SPIKE02_IPV4), AAAA("spike-02", SPIKE02_IPV6), - // A("@", SPIKE02_IPV4, TTL("10m")), - // AAAA("@", SPIKE02_IPV6, TTL("10m")), - // A("www", SPIKE02_IPV4, TTL("10m")), - // AAAA("www", SPIKE02_IPV6, TTL("10m")), - // A("api", SPIKE02_IPV4, TTL("10m")), - // AAAA("api", SPIKE02_IPV6, TTL("10m")), - // A("maps", SPIKE02_IPV4, TTL("10m")), - // AAAA("maps", SPIKE02_IPV6, TTL("10m")), - // A("mapz", SPIKE02_IPV4, TTL("10m")), - // AAAA("mapz", SPIKE02_IPV6, TTL("10m")), + // A("@", SPIKE02_IPV4), + // AAAA("@", SPIKE02_IPV6), + // A("www", SPIKE02_IPV4), + // AAAA("www", SPIKE02_IPV6), + // A("api", SPIKE02_IPV4), + // AAAA("api", SPIKE02_IPV6), + // A("maps", SPIKE02_IPV4), + // AAAA("maps", SPIKE02_IPV6), + // A("mapz", SPIKE02_IPV4), + // AAAA("mapz", SPIKE02_IPV6), A("spike-02.dub", SPIKE02_INTERNAL), A("spike-02.oob", SPIKE02_OOB), A("spike-03", SPIKE03_IPV4), AAAA("spike-03", SPIKE03_IPV6), - // A("@", SPIKE03_IPV4, TTL("10m")), - // AAAA("@", SPIKE03_IPV6, TTL("10m")), - // A("www", SPIKE03_IPV4, TTL("10m")), - // AAAA("www", SPIKE03_IPV6, TTL("10m")), - // A("api", SPIKE03_IPV4, TTL("10m")), - // AAAA("api", SPIKE03_IPV6, TTL("10m")), - // A("maps", SPIKE03_IPV4, TTL("10m")), - // AAAA("maps", SPIKE03_IPV6, TTL("10m")), - // A("mapz", SPIKE03_IPV4, TTL("10m")), - // AAAA("mapz", SPIKE03_IPV6, TTL("10m")), + // A("@", SPIKE03_IPV4), + // AAAA("@", SPIKE03_IPV6), + // A("www", SPIKE03_IPV4), + // AAAA("www", SPIKE03_IPV6), + // A("api", SPIKE03_IPV4), + // AAAA("api", SPIKE03_IPV6), + // A("maps", SPIKE03_IPV4), + // AAAA("maps", SPIKE03_IPV6), + // A("mapz", SPIKE03_IPV4), + // AAAA("mapz", SPIKE03_IPV6), A("spike-03.dub", SPIKE03_INTERNAL), A("spike-03.oob", SPIKE03_OOB), - A("spike-04", SPIKE04_IPV4), - AAAA("spike-04", SPIKE04_IPV6), - // A("@", SPIKE04_IPV4, TTL("10m")), - // AAAA("@", SPIKE04_IPV6, TTL("10m")), - // A("www", SPIKE04_IPV4, TTL("10m")), - // AAAA("www", SPIKE04_IPV6, TTL("10m")), - // A("api", SPIKE04_IPV4, TTL("10m")), - // AAAA("api", SPIKE04_IPV6, TTL("10m")), - // A("maps", SPIKE04_IPV4, TTL("10m")), - // AAAA("maps", SPIKE04_IPV6, TTL("10m")), - // A("mapz", SPIKE04_IPV4, TTL("10m")), - // AAAA("mapz", SPIKE04_IPV6, TTL("10m")), - A("spike-04.bm", SPIKE04_INTERNAL), - A("spike-04.oob", SPIKE04_OOB), - - A("spike-05", SPIKE05_IPV4), - AAAA("spike-05", SPIKE05_IPV6), - // A("@", SPIKE05_IPV4, TTL("10m")), - // AAAA("@", SPIKE05_IPV6, TTL("10m")), - // A("www", SPIKE05_IPV4, TTL("10m")), - // AAAA("www", SPIKE05_IPV6, TTL("10m")), - // A("api", SPIKE05_IPV4, TTL("10m")), - // AAAA("api", SPIKE05_IPV6, TTL("10m")), - // A("maps", SPIKE05_IPV4, TTL("10m")), - // AAAA("maps", SPIKE05_IPV6, TTL("10m")), - // A("mapz", SPIKE05_IPV4, TTL("10m")), - // AAAA("mapz", SPIKE05_IPV6, TTL("10m")), - A("spike-05.bm", SPIKE05_INTERNAL), - A("spike-05.oob", SPIKE05_OOB), - A("spike-06", SPIKE06_IPV4), AAAA("spike-06", SPIKE06_IPV6), - A("@", SPIKE06_IPV4, TTL("10m")), - AAAA("@", SPIKE06_IPV6, TTL("10m")), - A("www", SPIKE06_IPV4, TTL("10m")), - AAAA("www", SPIKE06_IPV6, TTL("10m")), - A("api", SPIKE06_IPV4, TTL("10m")), - AAAA("api", SPIKE06_IPV6, TTL("10m")), - A("maps", SPIKE06_IPV4, TTL("10m")), - AAAA("maps", SPIKE06_IPV6, TTL("10m")), - A("mapz", SPIKE06_IPV4, TTL("10m")), - AAAA("mapz", SPIKE06_IPV6, TTL("10m")), + A("@", SPIKE06_IPV4), + AAAA("@", SPIKE06_IPV6), + A("www", SPIKE06_IPV4), + AAAA("www", SPIKE06_IPV6), + A("api", SPIKE06_IPV4), + AAAA("api", SPIKE06_IPV6), + A("maps", SPIKE06_IPV4), + AAAA("maps", SPIKE06_IPV6), + A("mapz", SPIKE06_IPV4), + AAAA("mapz", SPIKE06_IPV6), A("spike-06.ams", SPIKE06_INTERNAL), A("spike-06.oob", SPIKE06_OOB), A("spike-07", SPIKE07_IPV4), AAAA("spike-07", SPIKE07_IPV6), - A("@", SPIKE07_IPV4, TTL("10m")), - AAAA("@", SPIKE07_IPV6, TTL("10m")), - A("www", SPIKE07_IPV4, TTL("10m")), - AAAA("www", SPIKE07_IPV6, TTL("10m")), - A("api", SPIKE07_IPV4, TTL("10m")), - AAAA("api", SPIKE07_IPV6, TTL("10m")), - A("maps", SPIKE07_IPV4, TTL("10m")), - AAAA("maps", SPIKE07_IPV6, TTL("10m")), - A("mapz", SPIKE07_IPV4, TTL("10m")), - AAAA("mapz", SPIKE07_IPV6, TTL("10m")), + A("@", SPIKE07_IPV4), + AAAA("@", SPIKE07_IPV6), + A("www", SPIKE07_IPV4), + AAAA("www", SPIKE07_IPV6), + A("api", SPIKE07_IPV4), + AAAA("api", SPIKE07_IPV6), + A("maps", SPIKE07_IPV4), + AAAA("maps", SPIKE07_IPV6), + A("mapz", SPIKE07_IPV4), + AAAA("mapz", SPIKE07_IPV6), A("spike-07.ams", SPIKE07_INTERNAL), A("spike-07.oob", SPIKE07_OOB), A("spike-08", SPIKE08_IPV4), AAAA("spike-08", SPIKE08_IPV6), - A("@", SPIKE08_IPV4, TTL("10m")), - AAAA("@", SPIKE08_IPV6, TTL("10m")), - A("www", SPIKE08_IPV4, TTL("10m")), - AAAA("www", SPIKE08_IPV6, TTL("10m")), - A("api", SPIKE08_IPV4, TTL("10m")), - AAAA("api", SPIKE08_IPV6, TTL("10m")), - A("maps", SPIKE08_IPV4, TTL("10m")), - AAAA("maps", SPIKE08_IPV6, TTL("10m")), - A("mapz", SPIKE08_IPV4, TTL("10m")), - AAAA("mapz", SPIKE08_IPV6, TTL("10m")), + A("@", SPIKE08_IPV4), + AAAA("@", SPIKE08_IPV6), + A("www", SPIKE08_IPV4), + AAAA("www", SPIKE08_IPV6), + A("api", SPIKE08_IPV4), + AAAA("api", SPIKE08_IPV6), + A("maps", SPIKE08_IPV4), + AAAA("maps", SPIKE08_IPV6), + A("mapz", SPIKE08_IPV4), + AAAA("mapz", SPIKE08_IPV6), A("spike-08.ams", SPIKE08_INTERNAL), A("spike-08.oob", SPIKE08_OOB), - // Rails application servers - - A("thorn-02.ams", THORN02_INTERNAL), - A("rails2.ams", THORN02_INTERNAL), - A("thorn-02.oob", THORN02_OOB), - - A("thorn-03.ams", THORN03_INTERNAL), - A("rails3.ams", THORN03_INTERNAL), - A("thorn-03.oob", THORN03_OOB), - // Nominatim servers A("pummelzacken", PUMMELZACKEN_IPV4), @@ -307,9 +277,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("rhaegal", RHAEGAL_IPV4), + A("palulukon", PALULUKON_IPV4), + A("pyrene", PYRENE_IPV4), AAAA("pyrene", PYRENE_IPV6), - A("pyrene.oob", TIAMAT00_INTERNAL), + A("pyrene.oob", PYRENE_OOB), A("bowser", BOWSER_IPV4), @@ -325,8 +297,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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")), - // Fastly DNS based ACME Challenge requirement - CNAME("_acme-challenge.tile", "bxve5ryiwwv7woiraq.fastly-validations.com.", TTL("10m")), A("render", CULEBRE_IPV4), A("render", NIDHOGG_IPV4), @@ -404,16 +374,24 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Development server with wildcard alias for user sites - A("errol", ERROL_IPV4), - A("dev", ERROL_IPV4), - A("*.dev", ERROL_IPV4), - A("ooc", ERROL_IPV4), - A("a.ooc", ERROL_IPV4), - A("b.ooc", ERROL_IPV4), - A("c.ooc", ERROL_IPV4), - A("npe", ERROL_IPV4), - A("errol.ucl", ERROL_INTERNAL), - A("errol.oob", ERROL_OOB), + A("faffy", FAFFY_IPV4), + AAAA("faffy", FAFFY_IPV6), + A("dev", FAFFY_IPV4), + AAAA("dev", FAFFY_IPV6), + A("*.dev", FAFFY_IPV4), + AAAA("*.dev", FAFFY_IPV6), + A("ooc", FAFFY_IPV4), + AAAA("ooc", FAFFY_IPV6), + A("a.ooc", FAFFY_IPV4), + AAAA("a.ooc", FAFFY_IPV6), + A("b.ooc", FAFFY_IPV4), + AAAA("b.ooc", FAFFY_IPV6), + A("c.ooc", FAFFY_IPV4), + AAAA("c.ooc", FAFFY_IPV6), + A("npe", FAFFY_IPV4), + AAAA("npe", FAFFY_IPV6), + A("faffy.ams", FAFFY_INTERNAL), + A("faffy.oob", FAFFY_OOB), // Foundation server @@ -460,13 +438,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("c.os", KESSIE_IPV6, TTL("1h")), A("kessie.oob", KESSIE_OOB), - // Munin server - - A("urmel", URMEL_IPV4), - A("munin", URMEL_IPV4), - A("urmel.ucl", URMEL_INTERNAL), - A("urmel.oob", URMEL_OOB), - // Prometheus server A("stormfly-03", STORMFLY03_IPV4), @@ -475,16 +446,22 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("prometheus", STORMFLY03_IPV6, TTL("10m")), A("stormfly-03.oob", STORMFLY03_OOB), - // Chef server + // Management server - A("sarel", SAREL_IPV4), - A("chef", SAREL_IPV4), - A("hardware", SAREL_IPV4), - A("acme", SAREL_IPV4), - A("git", SAREL_IPV4, TTL("10m")), - A("dns", SAREL_IPV4, TTL("10m")), - A("sarel.ucl", SAREL_INTERNAL), - A("sarel.oob", SAREL_OOB), + A("idris", IDRIS_IPV4), + AAAA("idris", IDRIS_IPV6), + A("acme", IDRIS_IPV4), + AAAA("acme", IDRIS_IPV6), + A("chef", IDRIS_IPV4), + AAAA("chef", IDRIS_IPV6), + A("dns", IDRIS_IPV4), + AAAA("dns", IDRIS_IPV6), + A("git", IDRIS_IPV4), + AAAA("git", IDRIS_IPV6), + A("hardware", IDRIS_IPV4), + AAAA("hardware", IDRIS_IPV6), + A("idris.dub", IDRIS_INTERNAL), + A("idris.oob", IDRIS_OOB), // Forum server @@ -531,22 +508,23 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("lists", SHENRON_IPV6), A("help", SHENRON_IPV4), AAAA("help", SHENRON_IPV6), - A("shenron.bm", SHENRON_INTERNAL), - - // Lockheed service - - A("lockheed", LOCKHEED_IPV4), - AAAA("lockheed", LOCKHEED_IPV6), - A("svn", LOCKHEED_IPV4), - AAAA("svn", LOCKHEED_IPV6), - A("trac", LOCKHEED_IPV4), - AAAA("trac", LOCKHEED_IPV6), - A("irc", LOCKHEED_IPV4), - AAAA("irc", LOCKHEED_IPV6), - A("blogs", LOCKHEED_IPV4), - AAAA("blogs", LOCKHEED_IPV6), - A("lockheed.ams", LOCKHEED_INTERNAL), - A("lockheed.oob", LOCKHEED_OOB), + + // Naga service + + A("naga", NAGA_IPV4), + AAAA("naga", NAGA_IPV6), + A("svn", NAGA_IPV4), + AAAA("svn", NAGA_IPV6), + A("trac", NAGA_IPV4), + AAAA("trac", NAGA_IPV6), + A("irc", NAGA_IPV4), + AAAA("irc", NAGA_IPV6), + A("blogs", NAGA_IPV4), + AAAA("blogs", NAGA_IPV6), + A("munin", NAGA_IPV4), + AAAA("munin", NAGA_IPV6), + A("naga.dub", NAGA_INTERNAL), + A("naga.oob", NAGA_OOB), // Wiki servers @@ -610,61 +588,19 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("meraxes", MERAXES_IPV6), A("firnen", FIRNEN_IPV4), - // Blades - - A("tiamat-00", TIAMAT00_IPV4), - A("tiamat-00.ucl", TIAMAT00_INTERNAL), - A("tiamat-00.oob", TIAMAT00_OOB), - A("tiamat-01", TIAMAT01_IPV4), - A("tiamat-01.ucl", TIAMAT01_INTERNAL), - A("tiamat-01.oob", TIAMAT01_OOB), - A("tiamat-02", TIAMAT02_IPV4), - A("tiamat-02.ucl", TIAMAT02_INTERNAL), - A("tiamat-02.oob", TIAMAT02_OOB), - A("tiamat-03", TIAMAT03_IPV4), - A("tiamat-03.ucl", TIAMAT03_INTERNAL), - A("tiamat-03.oob", TIAMAT03_OOB), - A("tiamat-10", TIAMAT10_IPV4), - A("tiamat-10.ucl", TIAMAT10_INTERNAL), - A("tiamat-10.oob", TIAMAT10_OOB), - A("tiamat-11", TIAMAT11_IPV4), - A("tiamat-11.ucl", TIAMAT11_INTERNAL), - A("tiamat-11.oob", TIAMAT11_OOB), - A("tiamat-12", TIAMAT12_IPV4), - A("tiamat-12.ucl", TIAMAT12_INTERNAL), - A("tiamat-12.oob", TIAMAT12_OOB), - A("tiamat-13", TIAMAT13_IPV4), - A("tiamat-13.ucl", TIAMAT13_INTERNAL), - A("tiamat-13.oob", TIAMAT13_OOB), - A("tiamat-20", TIAMAT20_IPV4), - A("tiamat-20.ucl", TIAMAT20_INTERNAL), - A("tiamat-20.oob", TIAMAT20_OOB), - A("tiamat-21", TIAMAT21_IPV4), - A("tiamat-21.ucl", TIAMAT21_INTERNAL), - A("tiamat-21.oob", TIAMAT21_OOB), - A("tiamat-22", TIAMAT22_IPV4), - A("tiamat-22.ucl", TIAMAT22_INTERNAL), - A("tiamat-22.oob", TIAMAT22_OOB), - A("tiamat-23", TIAMAT23_IPV4), - A("tiamat-23.ucl", TIAMAT23_INTERNAL), - A("tiamat-23.oob", TIAMAT23_OOB), - // Spare - A("idris", IDRIS_IPV4), - AAAA("idris", IDRIS_IPV6), - A("idris.dub", IDRIS_INTERNAL), - A("idris.oob", IDRIS_OOB), A("konqi", KONQI_IPV4), AAAA("konqi", KONQI_IPV6), A("konqi.dub", KONQI_INTERNAL), A("konqi.oob", KONQI_OOB), - A("naga", NAGA_IPV4), - AAAA("naga", NAGA_IPV6), - A("naga.dub", NAGA_INTERNAL), - A("naga.oob", NAGA_OOB), + + A("sarel", SAREL_IPV4), + A("sarel.ucl", SAREL_INTERNAL), + A("sarel.oob", SAREL_OOB), // Discourse server ("community") + A("jakelong", JAKELONG_IPV4), AAAA("jakelong", JAKELONG_IPV6), A("community", JAKELONG_IPV4), @@ -673,6 +609,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("communities", JAKELONG_IPV6), A("jakelong.dub", JAKELONG_INTERNAL), A("jakelong.oob", JAKELONG_OOB), + CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."), // Donation site