Replace kessie DNS with lockheed

diff --git a/src/openstreetmap-uk.js b/src/openstreetmap-uk.js
index f1f3d320de827ebdb362bb07dc64adfc72e3a8ec..5cce6eb35c4eea0e6387649739b58352487ace7d 100644 (file)
--- a/src/openstreetmap-uk.js
+++ b/src/openstreetmap-uk.js
@@ -44,40 +44,40 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Aerial imagery sites
 
-  A("hampshire.aerial", KESSIE_IPV4, TTL("1h")),
-  AAAA("hampshire.aerial", KESSIE_IPV6, TTL("1h")),
-  A("a.hampshire.aerial", KESSIE_IPV4, TTL("1h")),
-  AAAA("a.hampshire.aerial", KESSIE_IPV6, TTL("1h")),
-  A("b.hampshire.aerial", KESSIE_IPV4, TTL("1h")),
-  AAAA("b.hampshire.aerial", KESSIE_IPV6, TTL("1h")),
-  A("c.hampshire.aerial", KESSIE_IPV4, TTL("1h")),
-  AAAA("c.hampshire.aerial", KESSIE_IPV6, TTL("1h")),
-
-  A("surrey.aerial", KESSIE_IPV4, TTL("1h")),
-  AAAA("surrey.aerial", KESSIE_IPV6, TTL("1h")),
-  A("a.surrey.aerial", KESSIE_IPV4, TTL("1h")),
-  AAAA("a.surrey.aerial", KESSIE_IPV6, TTL("1h")),
-  A("b.surrey.aerial", KESSIE_IPV4, TTL("1h")),
-  AAAA("b.surrey.aerial", KESSIE_IPV6, TTL("1h")),
-  A("c.surrey.aerial", KESSIE_IPV4, TTL("1h")),
-  AAAA("c.surrey.aerial", KESSIE_IPV6, TTL("1h")),
-
-  A("os", KESSIE_IPV4, TTL("1h")),
-  AAAA("os", KESSIE_IPV6, TTL("1h")),
-  A("a.os", KESSIE_IPV4, TTL("1h")),
-  AAAA("a.os", KESSIE_IPV6, TTL("1h")),
-  A("b.os", KESSIE_IPV4, TTL("1h")),
-  AAAA("b.os", KESSIE_IPV6, TTL("1h")),
-  A("c.os", KESSIE_IPV4, TTL("1h")),
-  AAAA("c.os", KESSIE_IPV6, TTL("1h")),
-
-  A("ea", KESSIE_IPV4, TTL("1h")),
-  AAAA("ea", KESSIE_IPV6, TTL("1h")),
-  A("a.ea", KESSIE_IPV4, TTL("1h")),
-  AAAA("a.ea", KESSIE_IPV6, TTL("1h")),
-  A("b.ea", KESSIE_IPV4, TTL("1h")),
-  AAAA("b.ea", KESSIE_IPV6, TTL("1h")),
-  A("c.ea", KESSIE_IPV4, TTL("1h")),
-  AAAA("c.ea", KESSIE_IPV6, TTL("1h"))
+  A("hampshire.aerial", LOCKHEED_IPV4),
+  AAAA("hampshire.aerial", LOCKHEED_IPV6),
+  A("a.hampshire.aerial", LOCKHEED_IPV4),
+  AAAA("a.hampshire.aerial", LOCKHEED_IPV6),
+  A("b.hampshire.aerial", LOCKHEED_IPV4),
+  AAAA("b.hampshire.aerial", LOCKHEED_IPV6),
+  A("c.hampshire.aerial", LOCKHEED_IPV4),
+  AAAA("c.hampshire.aerial", LOCKHEED_IPV6),
+
+  A("surrey.aerial", LOCKHEED_IPV4),
+  AAAA("surrey.aerial", LOCKHEED_IPV6),
+  A("a.surrey.aerial", LOCKHEED_IPV4),
+  AAAA("a.surrey.aerial", LOCKHEED_IPV6),
+  A("b.surrey.aerial", LOCKHEED_IPV4),
+  AAAA("b.surrey.aerial", LOCKHEED_IPV6),
+  A("c.surrey.aerial", LOCKHEED_IPV4),
+  AAAA("c.surrey.aerial", LOCKHEED_IPV6),
+
+  A("os", LOCKHEED_IPV4),
+  AAAA("os", LOCKHEED_IPV6),
+  A("a.os", LOCKHEED_IPV4),
+  AAAA("a.os", LOCKHEED_IPV6),
+  A("b.os", LOCKHEED_IPV4),
+  AAAA("b.os", LOCKHEED_IPV6),
+  A("c.os", LOCKHEED_IPV4),
+  AAAA("c.os", LOCKHEED_IPV6),
+
+  A("ea", LOCKHEED_IPV4),
+  AAAA("ea", LOCKHEED_IPV6),
+  A("a.ea", LOCKHEED_IPV4),
+  AAAA("a.ea", LOCKHEED_IPV6),
+  A("b.ea", LOCKHEED_IPV4),
+  AAAA("b.ea", LOCKHEED_IPV6),
+  A("c.ea", LOCKHEED_IPV4),
+  AAAA("c.ea", LOCKHEED_IPV6)
 
 );

diff --git a/src/openstreetmap-za.js b/src/openstreetmap-za.js
index 2c68ea882546856acebee62239a07b838e35c422..7fcc16d7f8bf22ec995ecc8e20cc5232b854b881 100644 (file)
--- a/src/openstreetmap-za.js
+++ b/src/openstreetmap-za.js
@@ -55,16 +55,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   HTTPS("b.aerial", 1, ".", "alpn=h2"),
   HTTPS("c.aerial", 1, ".", "alpn=h2"),
 
-  // Aerial imagery sites on kessie
-
-  A("coct.aerial", KESSIE_IPV4),
-  AAAA("coct.aerial", KESSIE_IPV6),
-  A("a.coct.aerial", KESSIE_IPV4),
-  AAAA("a.coct.aerial", KESSIE_IPV6),
-  A("b.coct.aerial", KESSIE_IPV4),
-  AAAA("b.coct.aerial", KESSIE_IPV6),
-  A("c.coct.aerial", KESSIE_IPV4),
-  AAAA("c.coct.aerial", KESSIE_IPV6),
+  A("coct.aerial", LOCKHEED_IPV4),
+  AAAA("coct.aerial", LOCKHEED_IPV6),
+  A("a.coct.aerial", LOCKHEED_IPV4),
+  AAAA("a.coct.aerial", LOCKHEED_IPV6),
+  A("b.coct.aerial", LOCKHEED_IPV4),
+  AAAA("b.coct.aerial", LOCKHEED_IPV6),
+  A("c.coct.aerial", LOCKHEED_IPV4),
+  AAAA("c.coct.aerial", LOCKHEED_IPV6),
 
   // HTTPS / SVCB records
   HTTPS("coct.aerial", 1, ".", "alpn=h2"),
@@ -72,14 +70,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   HTTPS("b.coct.aerial", 1, ".", "alpn=h2"),
   HTTPS("c.coct.aerial", 1, ".", "alpn=h2"),
 
-  A("topo", KESSIE_IPV4),
-  AAAA("topo", KESSIE_IPV6),
-  A("a.topo", KESSIE_IPV4),
-  AAAA("a.topo", KESSIE_IPV6),
-  A("b.topo", KESSIE_IPV4),
-  AAAA("b.topo", KESSIE_IPV6),
-  A("c.topo", KESSIE_IPV4),
-  AAAA("c.topo", KESSIE_IPV6),
+  A("topo", LOCKHEED_IPV4),
+  AAAA("topo", LOCKHEED_IPV6),
+  A("a.topo", LOCKHEED_IPV4),
+  AAAA("a.topo", LOCKHEED_IPV6),
+  A("b.topo", LOCKHEED_IPV4),
+  AAAA("b.topo", LOCKHEED_IPV6),
+  A("c.topo", LOCKHEED_IPV4),
+  AAAA("c.topo", LOCKHEED_IPV6),
 
   // HTTPS / SVCB records
   HTTPS("topo", 1, ".", "alpn=h2"),
@@ -87,14 +85,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   HTTPS("b.topo", 1, ".", "alpn=h2"),
   HTTPS("c.topo", 1, ".", "alpn=h2"),
 
-  A("namibia-topo", KESSIE_IPV4),
-  AAAA("namibia-topo", KESSIE_IPV6),
-  A("a.namibia-topo", KESSIE_IPV4),
-  AAAA("a.namibia-topo", KESSIE_IPV6),
-  A("b.namibia-topo", KESSIE_IPV4),
-  AAAA("b.namibia-topo", KESSIE_IPV6),
-  A("c.namibia-topo", KESSIE_IPV4),
-  AAAA("c.namibia-topo", KESSIE_IPV6),
+  A("namibia-topo", LOCKHEED_IPV4),
+  AAAA("namibia-topo", LOCKHEED_IPV6),
+  A("a.namibia-topo", LOCKHEED_IPV4),
+  AAAA("a.namibia-topo", LOCKHEED_IPV6),
+  A("b.namibia-topo", LOCKHEED_IPV4),
+  AAAA("b.namibia-topo", LOCKHEED_IPV6),
+  A("c.namibia-topo", LOCKHEED_IPV4),
+  AAAA("c.namibia-topo", LOCKHEED_IPV6),
 
   // HTTPS / SVCB records
   HTTPS("namibia-topo", 1, ".", "alpn=h2"),

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 9269372d5adaa9fb1b3ed82a685b43a23f3644ea..9d12e2e76611a326fffb18c220015c2a06bd637f 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -459,25 +459,23 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Imagery servers
 
-  A("kessie", KESSIE_IPV4),
-  AAAA("kessie", KESSIE_IPV6),
-  A("agri", KESSIE_IPV4),
-  AAAA("agri", KESSIE_IPV6),
-  A("a.agri", KESSIE_IPV4),
-  AAAA("a.agri", KESSIE_IPV6),
-  A("b.agri", KESSIE_IPV4),
-  AAAA("b.agri", KESSIE_IPV6),
-  A("c.agri", KESSIE_IPV4),
-  AAAA("c.agri", KESSIE_IPV6),
-  A("os", KESSIE_IPV4),
-  AAAA("os", KESSIE_IPV6),
-  A("a.os", KESSIE_IPV4),
-  AAAA("a.os", KESSIE_IPV6),
-  A("b.os", KESSIE_IPV4),
-  AAAA("b.os", KESSIE_IPV6),
-  A("c.os", KESSIE_IPV4),
-  AAAA("c.os", KESSIE_IPV6),
-  A("kessie.oob", KESSIE_OOB),
+  A("agri", LOCKHEED_IPV4),
+  AAAA("agri", LOCKHEED_IPV6),
+  A("a.agri", LOCKHEED_IPV4),
+  AAAA("a.agri", LOCKHEED_IPV6),
+  A("b.agri", LOCKHEED_IPV4),
+  AAAA("b.agri", LOCKHEED_IPV6),
+  A("c.agri", LOCKHEED_IPV4),
+  AAAA("c.agri", LOCKHEED_IPV6),
+  A("os", LOCKHEED_IPV4),
+  AAAA("os", LOCKHEED_IPV6),
+  A("a.os", LOCKHEED_IPV4),
+  AAAA("a.os", LOCKHEED_IPV6),
+  A("b.os", LOCKHEED_IPV4),
+  AAAA("b.os", LOCKHEED_IPV6),
+  A("c.os", LOCKHEED_IPV4),
+  AAAA("c.os", LOCKHEED_IPV6),
+
 
   // Prometheus server and munin redirect
 
@@ -753,6 +751,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("dribble.ams", DRIBBLE_INTERNAL),
   A("dribble.oob", DRIBBLE_OOB),
 
+  A("kessie", KESSIE_IPV4),
+  AAAA("kessie", KESSIE_IPV6),
+  A("kessie.oob", KESSIE_OOB),
+
   // Uptime site at StatusCake
 
   CNAME("uptime", "uptimessl-new.statuscake.com."),