move za and us imagery to lockheed

[dns.git] / src / openstreetmap.js

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 28cab3beabf5b06188a2b92a31d2d54ecab3139b..b74992918289be46394b18d1b64ce2013e418eaa 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -223,12 +223,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("@", SPIKE06_IPV6, CF_PROXY_ON),
   A("www", SPIKE06_IPV4, CF_PROXY_ON),
   AAAA("www", SPIKE06_IPV6, CF_PROXY_ON),
-  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("api", SPIKE06_IPV4, CF_PROXY_ON),
+  AAAA("api", SPIKE06_IPV6, CF_PROXY_ON),
+  A("maps", SPIKE06_IPV4, CF_PROXY_ON),
+  AAAA("maps", SPIKE06_IPV6, CF_PROXY_ON),
+  A("mapz", SPIKE06_IPV4, CF_PROXY_ON),
+  AAAA("mapz", SPIKE06_IPV6, CF_PROXY_ON),
   A("spike-06.ams", SPIKE06_INTERNAL),
   A("spike-06.oob", SPIKE06_OOB),
 
@@ -238,12 +238,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("@", SPIKE07_IPV6, CF_PROXY_ON),
   A("www", SPIKE07_IPV4, CF_PROXY_ON),
   AAAA("www", SPIKE07_IPV6, CF_PROXY_ON),
-  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("api", SPIKE07_IPV4, CF_PROXY_ON),
+  AAAA("api", SPIKE07_IPV6, CF_PROXY_ON),
+  A("maps", SPIKE07_IPV4, CF_PROXY_ON),
+  AAAA("maps", SPIKE07_IPV6, CF_PROXY_ON),
+  A("mapz", SPIKE07_IPV4, CF_PROXY_ON),
+  AAAA("mapz", SPIKE07_IPV6, CF_PROXY_ON),
   A("spike-07.ams", SPIKE07_INTERNAL),
   A("spike-07.oob", SPIKE07_OOB),
 
@@ -253,12 +253,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("@", SPIKE08_IPV6, CF_PROXY_ON),
   A("www", SPIKE08_IPV4, CF_PROXY_ON),
   AAAA("www", SPIKE08_IPV6, CF_PROXY_ON),
-  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("api", SPIKE08_IPV4, CF_PROXY_ON),
+  AAAA("api", SPIKE08_IPV6, CF_PROXY_ON),
+  A("maps", SPIKE08_IPV4, CF_PROXY_ON),
+  AAAA("maps", SPIKE08_IPV6, CF_PROXY_ON),
+  A("mapz", SPIKE08_IPV4, CF_PROXY_ON),
+  AAAA("mapz", SPIKE08_IPV6, CF_PROXY_ON),
   A("spike-08.ams", SPIKE08_INTERNAL),
   A("spike-08.oob", SPIKE08_OOB),
 
@@ -325,6 +325,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("nidhogg", NIDHOGG_IPV6),
   A("nidhogg.oob", NIDHOGG_OOB),
 
+  A("wawel", WAWEL_IPV4),
+
   A("scorch", SCORCH_IPV4),
   AAAA("scorch", SCORCH_IPV6),
 
@@ -357,32 +359,19 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("render", CULEBRE_IPV6),
   AAAA("render", NIDHOGG_IPV6),
 
+  // Vector tile servers
+
+  A("cmok", CMOK_IPV4),
+
   // Site gateways
 
   A("ironbelly", IRONBELLY_IPV4),
   AAAA("ironbelly", IRONBELLY_IPV6),
   A("logstash", IRONBELLY_IPV4),
   AAAA("logstash", IRONBELLY_IPV6),
-  A("tiler", IRONBELLY_IPV4),
-  AAAA("tiler", IRONBELLY_IPV6),
-  A("us-imagery", IRONBELLY_IPV4),
-  AAAA("us-imagery", IRONBELLY_IPV6),
-  A("a.us-imagery", IRONBELLY_IPV4),
-  AAAA("a.us-imagery", IRONBELLY_IPV6),
-  A("b.us-imagery", IRONBELLY_IPV4),
-  AAAA("b.us-imagery", IRONBELLY_IPV6),
-  A("c.us-imagery", IRONBELLY_IPV4),
-  AAAA("c.us-imagery", IRONBELLY_IPV6),
   A("ironbelly.ams", IRONBELLY_INTERNAL),
   A("ironbelly.oob", IRONBELLY_OOB),
 
-  // HTTPS / SVCB records
-  HTTPS("tiler", 1, ".", "alpn=h2"),
-  HTTPS("us-imagery", 1, ".", "alpn=h2"),
-  HTTPS("a.us-imagery", 1, ".", "alpn=h2"),
-  HTTPS("b.us-imagery", 1, ".", "alpn=h2"),
-  HTTPS("c.us-imagery", 1, ".", "alpn=h2"),
-
   A("fafnir", FAFNIR_IPV4),
   AAAA("fafnir", FAFNIR_IPV6),
   A("fafnir.dub", FAFNIR_INTERNAL),
@@ -459,8 +448,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   A("staging.blog", FUME_IPV4),
   AAAA("staging.blog", FUME_IPV6),
-  A("birthday20", FUME_IPV4),
-  AAAA("birthday20", FUME_IPV6),
 
   // HTTPS / SVCB records
   HTTPS("blog", 1, ".", "alpn=h2"),
@@ -525,6 +512,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("idris", IDRIS_IPV6),
   A("acme", IDRIS_IPV4),
   AAAA("acme", IDRIS_IPV6),
+  A("apt", IDRIS_IPV4),
+  AAAA("apt", IDRIS_IPV6),
   A("chef", IDRIS_IPV4),
   AAAA("chef", IDRIS_IPV6),
   A("dns", IDRIS_IPV4),
@@ -604,6 +593,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("dmca", NAGA_IPV6),
   A("otrs", NAGA_IPV4),
   AAAA("otrs", NAGA_IPV6),
+  A("birthday20", NAGA_IPV4),
+  AAAA("birthday20", NAGA_IPV6),
 
   // HTTPS / SVCB records
   HTTPS("svn", 1, ".", "alpn=h2"),
@@ -690,15 +681,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Discourse server ("community")
 
-  A("jakelong", JAKELONG_IPV4),
-  AAAA("jakelong", JAKELONG_IPV6),
+  A("gorwen", GORWEN_IPV4),
+  AAAA("gorwen", GORWEN_IPV6),
 
-  A("community", JAKELONG_IPV4),
-  A("communities", JAKELONG_IPV4),
-  A("c", JAKELONG_IPV4),
-  AAAA("community", JAKELONG_IPV6),
-  AAAA("communities", JAKELONG_IPV6),
-  AAAA("c", JAKELONG_IPV6),
+  A("community", GORWEN_IPV4),
+  A("communities", GORWEN_IPV4),
+  A("c", GORWEN_IPV4),
+  AAAA("community", GORWEN_IPV6),
+  AAAA("communities", GORWEN_IPV6),
+  AAAA("c", GORWEN_IPV6),
 
   // HTTPS / SVCB records
   HTTPS("community", 1, ".", "alpn=h2"),
@@ -708,14 +699,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."),
   TXT("community", "google-site-verification=hQ8GZyj4KwnPqAX2oAzpbLrh6I5dfR08PSdL3icVkfg"),
 
-  A("forum", JAKELONG_IPV4),
-  AAAA("forum", JAKELONG_IPV6),
+  A("forum", GORWEN_IPV4),
+  AAAA("forum", GORWEN_IPV6),
 
   // HTTPS / SVCB records
   HTTPS("forum", 1, ".", "alpn=h2"),
 
-  A("jakelong.dub", JAKELONG_INTERNAL),
-  A("jakelong.oob", JAKELONG_OOB),
+  A("gorwen.dub", GORWEN_INTERNAL),
+  A("gorwen.oob", GORWEN_OOB),
 
   // Donation site and new OSMF crm site
 
@@ -728,6 +719,28 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   HTTPS("support", 1, ".", "alpn=h2"),
   HTTPS("supporting", 1, ".", "alpn=h2"),
 
+  A("lockheed", LOCKHEED_IPV4),
+  AAAA("lockheed", LOCKHEED_IPV6),
+  A("lockheed.ams", LOCKHEED_INTERNAL),
+  A("lockheed.oob", LOCKHEED_OOB),
+  A("tiler", LOCKHEED_IPV4),
+  AAAA("tiler", LOCKHEED_IPV6),
+  A("us-imagery", LOCKHEED_IPV4),
+  AAAA("us-imagery", LOCKHEED_IPV6),
+  A("a.us-imagery", LOCKHEED_IPV4),
+  AAAA("a.us-imagery", LOCKHEED_IPV6),
+  A("b.us-imagery", LOCKHEED_IPV4),
+  AAAA("b.us-imagery", LOCKHEED_IPV6),
+  A("c.us-imagery", LOCKHEED_IPV4),
+  AAAA("c.us-imagery", LOCKHEED_IPV6),
+
+  // HTTPS / SVCB records
+  HTTPS("tiler", 1, ".", "alpn=h2"),
+  HTTPS("us-imagery", 1, ".", "alpn=h2"),
+  HTTPS("a.us-imagery", 1, ".", "alpn=h2"),
+  HTTPS("b.us-imagery", 1, ".", "alpn=h2"),
+  HTTPS("c.us-imagery", 1, ".", "alpn=h2"),
+
   // Spare servers
 
   A("fume", FUME_IPV4),
@@ -735,6 +748,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("fume.dub", FUME_INTERNAL),
   A("fume.oob", FUME_OOB),
 
+  A("tabaluga", TABALUGA_IPV4),
+  AAAA("tabaluga", TABALUGA_IPV6),
+  A("tabaluga.ams", TABALUGA_INTERNAL),
+  A("tabaluga.oob", TABALUGA_OOB),
+
   // Uptime site at StatusCake
 
   CNAME("uptime", "uptimessl-new.statuscake.com."),