X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/eaa809af3ef6df8e0fa05c27dadac7d4a4842a30..5474f908b6961bda7a94e25ab23e4c637a9c95ff:/src/openstreetmap.js

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 3614ad7..8421455 100644
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -219,16 +219,16 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   A("spike-06", SPIKE06_IPV4),
   AAAA("spike-06", SPIKE06_IPV6),
-  // A("@", SPIKE06_IPV4, CF_PROXY_ON),
-  // AAAA("@", SPIKE06_IPV6, CF_PROXY_ON),
-  // A("www", SPIKE06_IPV4, CF_PROXY_ON),
-  // AAAA("www", SPIKE06_IPV6, CF_PROXY_ON),
-  // 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("@", SPIKE06_IPV4, CF_PROXY_ON),
+  AAAA("@", SPIKE06_IPV6, CF_PROXY_ON),
+  A("www", SPIKE06_IPV4, CF_PROXY_ON),
+  AAAA("www", SPIKE06_IPV6, CF_PROXY_ON),
+  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),
 
@@ -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,21 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("render", CULEBRE_IPV6),
   AAAA("render", NIDHOGG_IPV6),
 
+  // Vector tile servers
+
+  A("cmok", CMOK_IPV4),
+
+  CNAME("vector", "dualstack.n.sni.global.fastly.net."),
+
   // 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),
@@ -457,16 +448,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ridley.ucl", RIDLEY_INTERNAL),
   A("ridley.oob", RIDLEY_OOB),
 
-  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"),
   HTTPS("foundation", 1, ".", "alpn=h2"),
-  HTTPS("staging.blog", 1, ".", "alpn=h2"),
-  HTTPS("birthday20", 1, ".", "alpn=h2"),
 
   // Matomo server
 
@@ -606,6 +590,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"),
@@ -617,6 +603,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   HTTPS("hot", 1, ".", "alpn=h2"),
   HTTPS("dmca", 1, ".", "alpn=h2"),
   // HTTPS("otrs", 1, ".", "alpn=h2"), - OTRS is not available using HTTPS/2
+  HTTPS("birthday20", 1, ".", "alpn=h2"),
 
   A("naga.dub", NAGA_INTERNAL),
   A("naga.oob", NAGA_OOB),
@@ -690,17 +677,52 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("meraxes", MERAXES_IPV4),
   AAAA("meraxes", MERAXES_IPV6),
 
+  // Donation site and new OSMF crm site
+
+  A("donate", RIDLEY_IPV4),
+  A("support", RIDLEY_IPV4),
+  A("supporting", RIDLEY_IPV4),
+
+  // HTTPS / SVCB records
+  HTTPS("donate", 1, ".", "alpn=h2"),
+  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"),
+
   // Discourse server ("community")
 
-  A("gorwen", GORWEN_IPV4),
-  AAAA("gorwen", GORWEN_IPV6),
+  A("fume", FUME_IPV4),
+  AAAA("fume", FUME_IPV6),
+  A("fume.dub", FUME_INTERNAL),
+  A("fume.oob", FUME_OOB),
 
-  A("community", GORWEN_IPV4),
-  A("communities", GORWEN_IPV4),
-  A("c", GORWEN_IPV4),
-  AAAA("community", GORWEN_IPV6),
-  AAAA("communities", GORWEN_IPV6),
-  AAAA("c", GORWEN_IPV6),
+  A("community", FUME_IPV4),
+  A("communities", FUME_IPV4),
+  A("c", FUME_IPV4),
+  AAAA("community", FUME_IPV6),
+  AAAA("communities", FUME_IPV6),
+  AAAA("c", FUME_IPV6),
 
   // HTTPS / SVCB records
   HTTPS("community", 1, ".", "alpn=h2"),
@@ -710,32 +732,18 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."),
   TXT("community", "google-site-verification=hQ8GZyj4KwnPqAX2oAzpbLrh6I5dfR08PSdL3icVkfg"),
 
-  A("forum", GORWEN_IPV4),
-  AAAA("forum", GORWEN_IPV6),
+  A("forum", FUME_IPV4),
+  AAAA("forum", FUME_IPV6),
 
   // HTTPS / SVCB records
   HTTPS("forum", 1, ".", "alpn=h2"),
 
-  A("gorwen.dub", GORWEN_INTERNAL),
-  A("gorwen.oob", GORWEN_OOB),
-
-  // Donation site and new OSMF crm site
-
-  A("donate", RIDLEY_IPV4),
-  A("support", RIDLEY_IPV4),
-  A("supporting", RIDLEY_IPV4),
-
-  // HTTPS / SVCB records
-  HTTPS("donate", 1, ".", "alpn=h2"),
-  HTTPS("support", 1, ".", "alpn=h2"),
-  HTTPS("supporting", 1, ".", "alpn=h2"),
-
   // Spare servers
 
-  A("fume", FUME_IPV4),
-  AAAA("fume", FUME_IPV6),
-  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