Add back staging.blog

[dns.git] / src / openstreetmap.js

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 6b0e8d10c5eb76660dd1cfeb6eb548ef267a0a1d..53ec5f86591e59d1064ce8ac927fae99513241bf 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -363,32 +363,17 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   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),
@@ -463,14 +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),
-
   // 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 +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),
@@ -696,35 +677,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("meraxes", MERAXES_IPV4),
   AAAA("meraxes", MERAXES_IPV6),
 
-  // Discourse server ("community")
-
-  A("gorwen", GORWEN_IPV4),
-  AAAA("gorwen", GORWEN_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"),
-  HTTPS("communities", 1, ".", "alpn=h2"),
-  HTTPS("c", 1, ".", "alpn=h2"),
-
-  CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."),
-  TXT("community", "google-site-verification=hQ8GZyj4KwnPqAX2oAzpbLrh6I5dfR08PSdL3icVkfg"),
-
-  A("forum", GORWEN_IPV4),
-  AAAA("forum", GORWEN_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),
@@ -736,23 +688,71 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   HTTPS("support", 1, ".", "alpn=h2"),
   HTTPS("supporting", 1, ".", "alpn=h2"),
 
-  // Spare servers
+  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("fume", FUME_IPV4),
   AAAA("fume", FUME_IPV6),
   A("fume.dub", FUME_INTERNAL),
   A("fume.oob", FUME_OOB),
 
-  A("lockheed", LOCKHEED_IPV4),
-  AAAA("lockheed", LOCKHEED_IPV6),
-  A("lockheed.ams", LOCKHEED_INTERNAL),
-  A("lockheed.oob", LOCKHEED_OOB),
+  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"),
+  HTTPS("communities", 1, ".", "alpn=h2"),
+  HTTPS("c", 1, ".", "alpn=h2"),
+
+  CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."),
+  TXT("community", "google-site-verification=hQ8GZyj4KwnPqAX2oAzpbLrh6I5dfR08PSdL3icVkfg"),
+
+  A("forum", FUME_IPV4),
+  AAAA("forum", FUME_IPV6),
+
+  // HTTPS / SVCB records
+  HTTPS("forum", 1, ".", "alpn=h2"),
+
+  // Staging Blog Server
 
   A("tabaluga", TABALUGA_IPV4),
   AAAA("tabaluga", TABALUGA_IPV6),
   A("tabaluga.ams", TABALUGA_INTERNAL),
   A("tabaluga.oob", TABALUGA_OOB),
 
+  A("staging.blog", TABALUGA_IPV4),
+  AAAA("staging.blog", TABALUGA_IPV6),
+
+  // HTTPS / SVCB records
+  HTTPS("staging.blog", 1, ".", "alpn=h2"),
+
+  // Spare servers
+
   // Uptime site at StatusCake
 
   CNAME("uptime", "uptimessl-new.statuscake.com."),