X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/8dc67ca5bf5dd255c19cef7ebb6b0cbb6f348d42..96290e2264d1d526b4c9bb840c37786fdfaac867:/src/openstreetmap.js?ds=sidebyside diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 0c79af2..c43c3f0 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -22,6 +22,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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), @@ -29,7 +30,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), SPF_BUILDER({ label: "@", - ttl: "1h", parts: [ "v=spf1", "ip4:212.110.172.32", // shenron ipv4 @@ -41,7 +41,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), SPF_BUILDER({ label: "messages", - ttl: "1h", parts: [ "v=spf1", "ip4:212.110.172.32", // shenron ipv4 @@ -53,7 +52,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), SPF_BUILDER({ label: "noreply", - ttl: "1h", parts: [ "v=spf1", "ip4:212.110.172.32", // shenron ipv4 @@ -65,7 +63,17 @@ 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 + "mx", // safety net if we change mx + "-all" + ] + }), + + SPF_BUILDER({ + label: "community", parts: [ "v=spf1", "ip4:212.110.172.32", // shenron ipv4 @@ -104,19 +112,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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")), // Google postmaster tools verification 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), @@ -249,14 +251,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), @@ -290,11 +284,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), @@ -332,12 +321,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 @@ -408,9 +400,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), @@ -435,9 +424,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), @@ -501,15 +491,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("clifford.ucl", CLIFFORD_INTERNAL), A("clifford.oob", CLIFFORD_OOB), - // Discourse server ("community") - - A("lockheed", LOCKHEED_IPV4), - AAAA("lockheed", LOCKHEED_IPV6), - A("community", LOCKHEED_IPV4), - AAAA("community", LOCKHEED_IPV6), - A("lockheed.ams", LOCKHEED_INTERNAL), - A("lockheed.oob", LOCKHEED_OOB), - // KVMs A("kvm1.ucl", KVM1_INTERNAL), @@ -532,6 +513,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 @@ -544,18 +527,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), @@ -671,8 +661,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("naga", NAGA_IPV6), A("naga.dub", NAGA_INTERNAL), A("naga.oob", NAGA_OOB), + + // Discourse server ("community") A("jakelong", JAKELONG_IPV4), AAAA("jakelong", 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),