X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/a9ead867b160d721438fff9485c3a7832ea70503..a0be09536c4a5acff5212a40d3d9f5247d4305af:/src/openstreetmap.js

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index ff77a52..abd788c 100644
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -369,26 +369,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   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),
@@ -463,14 +446,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),
-
   // 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
 
@@ -623,6 +601,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),
@@ -696,17 +675,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"),
@@ -716,32 +730,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