Point www at Dublin

[dns.git] / src / openstreetmap.js

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 9269372d5adaa9fb1b3ed82a685b43a23f3644ea..58310c0e6a989acfe3664ad7cb2b6152d147ec0b 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -179,91 +179,91 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   A("spike-01", SPIKE01_IPV4),
   AAAA("spike-01", SPIKE01_IPV6),
-  // A("@", SPIKE01_IPV4),
-  // AAAA("@", SPIKE01_IPV6),
-  // A("www", SPIKE01_IPV4),
-  // AAAA("www", SPIKE01_IPV6),
-  // A("api", SPIKE01_IPV4),
-  // AAAA("api", SPIKE01_IPV6),
-  // A("maps", SPIKE01_IPV4),
-  // AAAA("maps", SPIKE01_IPV6),
-  // A("mapz", SPIKE01_IPV4),
-  // AAAA("mapz", SPIKE01_IPV6),
+  A("@", SPIKE01_IPV4),
+  AAAA("@", SPIKE01_IPV6),
+  A("www", SPIKE01_IPV4),
+  AAAA("www", SPIKE01_IPV6),
+  A("api", SPIKE01_IPV4),
+  AAAA("api", SPIKE01_IPV6),
+  A("maps", SPIKE01_IPV4),
+  AAAA("maps", SPIKE01_IPV6),
+  A("mapz", SPIKE01_IPV4),
+  AAAA("mapz", SPIKE01_IPV6),
   A("spike-01.dub", SPIKE01_INTERNAL),
   A("spike-01.oob", SPIKE01_OOB),
 
   A("spike-02", SPIKE02_IPV4),
   AAAA("spike-02", SPIKE02_IPV6),
-  // A("@", SPIKE02_IPV4),
-  // AAAA("@", SPIKE02_IPV6),
-  // A("www", SPIKE02_IPV4),
-  // AAAA("www", SPIKE02_IPV6),
-  // A("api", SPIKE02_IPV4),
-  // AAAA("api", SPIKE02_IPV6),
-  // A("maps", SPIKE02_IPV4),
-  // AAAA("maps", SPIKE02_IPV6),
-  // A("mapz", SPIKE02_IPV4),
-  // AAAA("mapz", SPIKE02_IPV6),
+  A("@", SPIKE02_IPV4),
+  AAAA("@", SPIKE02_IPV6),
+  A("www", SPIKE02_IPV4),
+  AAAA("www", SPIKE02_IPV6),
+  A("api", SPIKE02_IPV4),
+  AAAA("api", SPIKE02_IPV6),
+  A("maps", SPIKE02_IPV4),
+  AAAA("maps", SPIKE02_IPV6),
+  A("mapz", SPIKE02_IPV4),
+  AAAA("mapz", SPIKE02_IPV6),
   A("spike-02.dub", SPIKE02_INTERNAL),
   A("spike-02.oob", SPIKE02_OOB),
 
   A("spike-03", SPIKE03_IPV4),
   AAAA("spike-03", SPIKE03_IPV6),
-  // A("@", SPIKE03_IPV4),
-  // AAAA("@", SPIKE03_IPV6),
-  // A("www", SPIKE03_IPV4),
-  // AAAA("www", SPIKE03_IPV6),
-  // A("api", SPIKE03_IPV4),
-  // AAAA("api", SPIKE03_IPV6),
-  // A("maps", SPIKE03_IPV4),
-  // AAAA("maps", SPIKE03_IPV6),
-  // A("mapz", SPIKE03_IPV4),
-  // AAAA("mapz", SPIKE03_IPV6),
+  A("@", SPIKE03_IPV4),
+  AAAA("@", SPIKE03_IPV6),
+  A("www", SPIKE03_IPV4),
+  AAAA("www", SPIKE03_IPV6),
+  A("api", SPIKE03_IPV4),
+  AAAA("api", SPIKE03_IPV6),
+  A("maps", SPIKE03_IPV4),
+  AAAA("maps", SPIKE03_IPV6),
+  A("mapz", SPIKE03_IPV4),
+  AAAA("mapz", SPIKE03_IPV6),
   A("spike-03.dub", SPIKE03_INTERNAL),
   A("spike-03.oob", SPIKE03_OOB),
 
   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),
 
   A("spike-07", SPIKE07_IPV4),
   AAAA("spike-07", SPIKE07_IPV6),
-  A("@", SPIKE07_IPV4, CF_PROXY_ON),
-  AAAA("@", SPIKE07_IPV6, CF_PROXY_ON),
-  A("www", SPIKE07_IPV4, CF_PROXY_ON),
-  AAAA("www", SPIKE07_IPV6, CF_PROXY_ON),
-  A("api", SPIKE07_IPV4, CF_PROXY_ON),
-  AAAA("api", SPIKE07_IPV6, CF_PROXY_ON),
-  A("maps", SPIKE07_IPV4, CF_PROXY_ON),
-  AAAA("maps", SPIKE07_IPV6, CF_PROXY_ON),
-  A("mapz", SPIKE07_IPV4, CF_PROXY_ON),
-  AAAA("mapz", SPIKE07_IPV6, CF_PROXY_ON),
+  // A("@", SPIKE07_IPV4, CF_PROXY_ON),
+  // AAAA("@", SPIKE07_IPV6, CF_PROXY_ON),
+  // A("www", SPIKE07_IPV4, CF_PROXY_ON),
+  // AAAA("www", SPIKE07_IPV6, CF_PROXY_ON),
+  // A("api", SPIKE07_IPV4, CF_PROXY_ON),
+  // AAAA("api", SPIKE07_IPV6, CF_PROXY_ON),
+  // A("maps", SPIKE07_IPV4, CF_PROXY_ON),
+  // AAAA("maps", SPIKE07_IPV6, CF_PROXY_ON),
+  // A("mapz", SPIKE07_IPV4, CF_PROXY_ON),
+  // AAAA("mapz", SPIKE07_IPV6, CF_PROXY_ON),
   A("spike-07.ams", SPIKE07_INTERNAL),
   A("spike-07.oob", SPIKE07_OOB),
 
   A("spike-08", SPIKE08_IPV4),
   AAAA("spike-08", SPIKE08_IPV6),
-  A("@", SPIKE08_IPV4, CF_PROXY_ON),
-  AAAA("@", SPIKE08_IPV6, CF_PROXY_ON),
-  A("www", SPIKE08_IPV4, CF_PROXY_ON),
-  AAAA("www", SPIKE08_IPV6, CF_PROXY_ON),
-  A("api", SPIKE08_IPV4, CF_PROXY_ON),
-  AAAA("api", SPIKE08_IPV6, CF_PROXY_ON),
-  A("maps", SPIKE08_IPV4, CF_PROXY_ON),
-  AAAA("maps", SPIKE08_IPV6, CF_PROXY_ON),
-  A("mapz", SPIKE08_IPV4, CF_PROXY_ON),
-  AAAA("mapz", SPIKE08_IPV6, CF_PROXY_ON),
+  // A("@", SPIKE08_IPV4, CF_PROXY_ON),
+  // AAAA("@", SPIKE08_IPV6, CF_PROXY_ON),
+  // A("www", SPIKE08_IPV4, CF_PROXY_ON),
+  // AAAA("www", SPIKE08_IPV6, CF_PROXY_ON),
+  // A("api", SPIKE08_IPV4, CF_PROXY_ON),
+  // AAAA("api", SPIKE08_IPV6, CF_PROXY_ON),
+  // A("maps", SPIKE08_IPV4, CF_PROXY_ON),
+  // AAAA("maps", SPIKE08_IPV6, CF_PROXY_ON),
+  // A("mapz", SPIKE08_IPV4, CF_PROXY_ON),
+  // AAAA("mapz", SPIKE08_IPV6, CF_PROXY_ON),
   A("spike-08.ams", SPIKE08_INTERNAL),
   A("spike-08.oob", SPIKE08_OOB),
 
@@ -357,13 +357,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Site gateways
 
-  A("ironbelly", IRONBELLY_IPV4),
-  AAAA("ironbelly", IRONBELLY_IPV6),
-  A("logstash", IRONBELLY_IPV4),
-  AAAA("logstash", IRONBELLY_IPV6),
-  A("ironbelly.ams", IRONBELLY_INTERNAL),
-  A("ironbelly.oob", IRONBELLY_OOB),
-
   A("fafnir", FAFNIR_IPV4),
   AAAA("fafnir", FAFNIR_IPV6),
   A("fafnir.dub", FAFNIR_INTERNAL),
@@ -459,25 +452,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