X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/996105ef5d12d65f3afd10022934284bb3e81bdb..b42933108bb1fda92e195d9092306c31ec9b8f1b:/src/openstreetmap.js diff --git a/src/openstreetmap.js b/src/openstreetmap.js index 24ce9c8..2148435 100644 --- a/src/openstreetmap.js +++ b/src/openstreetmap.js @@ -1,12 +1,3 @@ -if ( DOMAIN == "openstreetmap.org" ) { - // Custom Domain for https://github.com/osmfoundation/welcome-mat/ - var WELCOME_DOMAIN = CNAME("welcome", "osmfoundation.github.io.") -} else { - // Github Pages only allows 1 domain name per site. - // Avoid Google Pages domain hijack - var WELCOME_DOMAIN = CNAME("welcome", "openstreetmmap.") -} - D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Publish CAA records indicating that only letsencrypt and globalsign (Fastly) should issue certificates @@ -49,6 +40,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:130.117.76.0/27", // amsterdam external + "ip6:2001:978:2:2C::172:0/112", // 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 +58,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:130.117.76.0/27", // amsterdam external + "ip6:2001:978:2:2C::172:0/112", // 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 +76,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:130.117.76.0/27", // amsterdam external + "ip6:2001:978:2:2C::172:0/112", // 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 +94,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:130.117.76.0/27", // amsterdam external + "ip6:2001:978:2:2C::172:0/112", // 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" ] @@ -101,6 +112,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:130.117.76.0/27", // amsterdam external + "ip6:2001:978:2:2C::172:0/112", // 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" ] @@ -262,7 +278,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), // Taginfo server A("grindtooth", GRINDTOOTH_IPV4), - A("taginfo", GRINDTOOTH_IPV4, TTL("10m")), + A("taginfo", GRINDTOOTH_IPV4), A("grindtooth.ucl", GRINDTOOTH_INTERNAL), A("grindtooth.oob", GRINDTOOTH_OOB), @@ -307,53 +323,47 @@ 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("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), @@ -447,8 +457,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 @@ -468,13 +478,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), @@ -524,6 +527,10 @@ 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("naga.dub", NAGA_INTERNAL), A("naga.oob", NAGA_OOB), @@ -540,27 +547,31 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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), @@ -578,12 +589,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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), @@ -601,6 +608,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), A("dribble.ams", DRIBBLE_INTERNAL), A("dribble.oob", DRIBBLE_OOB), + A("noquiklos", NOQUIKLOS_IPV4), + A("noquiklos.ucl", NOQUIKLOS_INTERNAL), + A("noquiklos.oob", NOQUIKLOS_OOB), + A("pummelzacken", PUMMELZACKEN_IPV4), A("pummelzacken.ucl", PUMMELZACKEN_INTERNAL), A("pummelzacken.oob", PUMMELZACKEN_OOB), @@ -608,14 +619,16 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), 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("tabaluga", TABALUGA_IPV4), AAAA("tabaluga", TABALUGA_IPV6), A("tabaluga.ams", TABALUGA_INTERNAL), A("tabaluga.oob", TABALUGA_OOB), + A("clifford", CLIFFORD_IPV4), + A("clifford.ucl", CLIFFORD_INTERNAL), + A("clifford.oob", CLIFFORD_OOB), + // Discourse server ("community") A("jakelong", JAKELONG_IPV4), @@ -626,9 +639,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), AAAA("community", JAKELONG_IPV6), AAAA("communities", JAKELONG_IPV6), AAAA("c", JAKELONG_IPV6), + CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."), + 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 @@ -638,9 +653,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER), CNAME("uptime", "uptimessl-new.statuscake.com."), - // Custom Domain for https://github.com/osmfoundation/welcome-mat/ - WELCOME_DOMAIN, - // Dynamic DNS records DYNAMIC_RECORDS