X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/514bd898d639988b4d5ab2c9a9d173f1c1b033cc..bcf6dcbb3fa6c40f88b12ce3342b42468a4bf99c:/src/openstreetmap.js diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 3699cab..42482e8 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" ] @@ -256,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), @@ -338,8 +335,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), @@ -417,16 +412,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 @@ -439,9 +442,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), @@ -487,16 +491,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 @@ -663,20 +673,26 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Spare - A("idris", IDRIS_IPV4), - AAAA("idris", IDRIS_IPV6), - A("idris.dub", IDRIS_INTERNAL), - A("idris.oob", IDRIS_OOB), + A("errol", ERROL_IPV4), + A("errol.ucl", ERROL_INTERNAL), + A("errol.oob", ERROL_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),