move za and us imagery to lockheed

diff --git a/src/openstreetmap-za.js b/src/openstreetmap-za.js
index 4c57b12a58a0cb5cca803fb6cbdee745258cde44..2c68ea882546856acebee62239a07b838e35c422 100644 (file)
--- a/src/openstreetmap-za.js
+++ b/src/openstreetmap-za.js
@@ -40,14 +40,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Aerial imagery sites on ironbelly
 
 
   // Aerial imagery sites on ironbelly
 

-  A("aerial", IRONBELLY_IPV4),
-  AAAA("aerial", IRONBELLY_IPV6),
-  A("a.aerial", IRONBELLY_IPV4),
-  AAAA("a.aerial", IRONBELLY_IPV6),
-  A("b.aerial", IRONBELLY_IPV4),
-  AAAA("b.aerial", IRONBELLY_IPV6),
-  A("c.aerial", IRONBELLY_IPV4),
-  AAAA("c.aerial", IRONBELLY_IPV6),
+  A("aerial", LOCKHEED_IPV4),
+  AAAA("aerial", LOCKHEED_IPV6),
+  A("a.aerial", LOCKHEED_IPV4),
+  AAAA("a.aerial", LOCKHEED_IPV6),
+  A("b.aerial", LOCKHEED_IPV4),
+  AAAA("b.aerial", LOCKHEED_IPV6),
+  A("c.aerial", LOCKHEED_IPV4),
+  AAAA("c.aerial", LOCKHEED_IPV6),

 
   // HTTPS / SVCB records
   HTTPS("aerial", 1, ".", "alpn=h2"),
 
   // HTTPS / SVCB records
   HTTPS("aerial", 1, ".", "alpn=h2"),

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 6b0e8d10c5eb76660dd1cfeb6eb548ef267a0a1d..b74992918289be46394b18d1b64ce2013e418eaa 100644 (file)
--- 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),
   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),
 
   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),
   A("fafnir", FAFNIR_IPV4),
   AAAA("fafnir", FAFNIR_IPV6),
   A("fafnir.dub", FAFNIR_INTERNAL),


@@ -736,6 +719,28 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   HTTPS("support", 1, ".", "alpn=h2"),
   HTTPS("supporting", 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"),
+

   // Spare servers
 
   A("fume", FUME_IPV4),
   // Spare servers
 
   A("fume", FUME_IPV4),


@@ -743,11 +748,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("fume.dub", FUME_INTERNAL),
   A("fume.oob", FUME_OOB),
 
   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("tabaluga", TABALUGA_IPV4),
   AAAA("tabaluga", TABALUGA_IPV6),
   A("tabaluga.ams", TABALUGA_INTERNAL),
   A("tabaluga", TABALUGA_IPV4),
   AAAA("tabaluga", TABALUGA_IPV6),
   A("tabaluga.ams", TABALUGA_INTERNAL),