X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/3ff5f829f77e74015bb3ae5298a146ea9180f00b..096e7bafc439754c962c03b34d6067ac29718cfa:/src/openstreetmap.js diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 2e3788f..82b15b5 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -30,11 +30,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), SPF_BUILDER({ label: "@", - ttl: "1h", 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 "mx", // safety net if we change mx "-all" ] @@ -42,11 +43,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), SPF_BUILDER({ label: "messages", - ttl: "1h", 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 "mx", // safety net if we change mx "-all" ] @@ -54,11 +56,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), SPF_BUILDER({ label: "noreply", - ttl: "1h", 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 "mx", // safety net if we change mx "-all" ] @@ -66,11 +69,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), SPF_BUILDER({ label: "otrs", - ttl: "1h", 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 "mx", // safety net if we change mx "-all" ] @@ -78,11 +82,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), SPF_BUILDER({ label: "community", - ttl: "1h", 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 "mx", // safety net if we change mx "-all" ] @@ -124,13 +129,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), CNAME("af323lytato5", "gv-o4v3qh5pfayqex.dv.googlehosted.com."), CNAME("irzdddnmh465", "gv-cwr6bvt7xsgact.dv.googlehosted.com."), - // Delegate geo.openstreetmap.org to PowerDNS - - NS("geo", QUALIFY("balerion")), - NS("geo", QUALIFY("saphira")), - NS("geo", QUALIFY("stormfly-04")), - NS("geo", QUALIFY("ridgeback")), - // Main web servers and their aliases A("spike-01", SPIKE01_IPV4), @@ -263,14 +261,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("rails3.ams", THORN03_INTERNAL), A("thorn-03.oob", THORN03_OOB), - A("thorn-04.bm", THORN04_INTERNAL), - A("rails4.bm", THORN04_INTERNAL), - A("thorn-04.oob", THORN04_OOB), - - A("thorn-05.bm", THORN05_INTERNAL), - A("rails5.bm", THORN05_INTERNAL), - A("thorn-05.oob", THORN05_OOB), - // Nominatim servers A("pummelzacken", PUMMELZACKEN_IPV4), @@ -304,11 +294,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Tile servers - A("orm", ORM_IPV4), - AAAA("orm", ORM_IPV6), - A("orm.ams", ORM_INTERNAL), - A("orm.oob", ORM_OOB), - A("odin", ODIN_IPV4), AAAA("odin", ODIN_IPV6), A("odin.ams", ODIN_INTERNAL), @@ -346,12 +331,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("necrosan", NECROSAN_IPV4), AAAA("necrosan", NECROSAN_IPV6), - CNAME("tile", "dualstack.k.sni.global.fastly.net.", TTL("10m")), - CNAME("a.tile", "dualstack.k.sni.global.fastly.net.", TTL("10m")), - CNAME("b.tile", "dualstack.k.sni.global.fastly.net.", TTL("10m")), - CNAME("c.tile", "dualstack.k.sni.global.fastly.net.", TTL("10m")), - // Fastly DNS based ACME Challenge requirement - CNAME("_acme-challenge.tile", "bxve5ryiwwv7woiraq.fastly-validations.com.", TTL("10m")), + 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")), + + A("render", CULEBRE_IPV4), + A("render", NIDHOGG_IPV4), + AAAA("render", CULEBRE_IPV6), + AAAA("render", NIDHOGG_IPV6), // Services machine @@ -422,9 +410,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("katla.bm", KATLA_INTERNAL), A("katla.oob", KATLA_OOB), - A("ramoth.ams", RAMOTH_INTERNAL), - A("ramoth.oob", RAMOTH_OOB), - // Development server with wildcard alias for user sites A("errol", ERROL_IPV4), @@ -438,6 +423,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("errol.ucl", ERROL_INTERNAL), A("errol.oob", ERROL_OOB), + A("faffy", FAFFY_IPV4), + AAAA("faffy", FAFFY_IPV6), + A("faffy.ams", FAFFY_INTERNAL), + A("faffy.oob", FAFFY_OOB), + // Foundation server A("ridley", RIDLEY_IPV4), @@ -449,9 +439,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("ridley.ucl", RIDLEY_INTERNAL), A("ridley.oob", RIDLEY_OOB), - // Piwik server + // Matomo server A("eustace", EUSTACE_IPV4), + A("matomo", EUSTACE_IPV4), A("piwik", EUSTACE_IPV4), A("eustace.ucl", EUSTACE_INTERNAL), A("eustace.oob", EUSTACE_OOB), @@ -537,6 +528,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Out of band access servers + A("oob1.ams", OOB1AMS_INTERNAL), + A("oob1.dub", OOB1DUB_INTERNAL), // Bytemark machine, and the services which operate from it @@ -549,18 +542,25 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("mta-sts", SHENRON_IPV6), A("lists", SHENRON_IPV4), AAAA("lists", SHENRON_IPV6), - A("svn", SHENRON_IPV4), - AAAA("svn", SHENRON_IPV6), - A("trac", SHENRON_IPV4), - AAAA("trac", SHENRON_IPV6), - A("irc", SHENRON_IPV4), - AAAA("irc", SHENRON_IPV6), A("help", SHENRON_IPV4), AAAA("help", SHENRON_IPV6), - A("blogs", SHENRON_IPV4, TTL("10m")), - AAAA("blogs", SHENRON_IPV6, TTL("10m")), 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), + // Wiki servers A("tabaluga", TABALUGA_IPV4), @@ -676,16 +676,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("naga", NAGA_IPV6), A("naga.dub", NAGA_INTERNAL), A("naga.oob", NAGA_OOB), - A("lockheed", LOCKHEED_IPV4), - AAAA("lockheed", LOCKHEED_IPV6), - A("lockheed.ams", LOCKHEED_INTERNAL), - A("lockheed.oob", LOCKHEED_OOB), // Discourse server ("community") A("jakelong", JAKELONG_IPV4), AAAA("jakelong", JAKELONG_IPV6), - A("community", JAKELONG_IPV6), + A("community", JAKELONG_IPV4), + A("communities", JAKELONG_IPV4), AAAA("community", JAKELONG_IPV6), + AAAA("communities", JAKELONG_IPV6), A("jakelong.dub", JAKELONG_INTERNAL), A("jakelong.oob", JAKELONG_OOB),