Drop spike-07 from www

[dns.git] / src / openstreetmap.js

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 3e7600d7de2d81c4f6a450745e4f126c37de1e3f..712dd7f0835be1193d04e00b6ef3a890f2dd6a80 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -124,13 +124,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   CNAME("af323lytato5", "gv-o4v3qh5pfayqex.dv.googlehosted.com."),
   CNAME("irzdddnmh465", "gv-cwr6bvt7xsgact.dv.googlehosted.com."),
 
   CNAME("af323lytato5", "gv-o4v3qh5pfayqex.dv.googlehosted.com."),
   CNAME("irzdddnmh465", "gv-cwr6bvt7xsgact.dv.googlehosted.com."),
 

-  // Delegate geo.openstreetmap.org to PowerDNS
-
-  NS("geo", QUALIFY("balerion")),
-  NS("geo", QUALIFY("saphira")),
-  NS("geo", QUALIFY("stormfly-04")),
-  NS("geo", QUALIFY("ridgeback")),
-

   // Main web servers and their aliases
 
   A("spike-01", SPIKE01_IPV4),
   // Main web servers and their aliases
 
   A("spike-01", SPIKE01_IPV4),


@@ -225,16 +218,16 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   A("spike-07", SPIKE07_IPV4),
   AAAA("spike-07", SPIKE07_IPV6),
 
   A("spike-07", SPIKE07_IPV4),
   AAAA("spike-07", SPIKE07_IPV6),

-  A("@", SPIKE07_IPV4, TTL("10m")),
-  AAAA("@", SPIKE07_IPV6, TTL("10m")),
-  A("www", SPIKE07_IPV4, TTL("10m")),
-  AAAA("www", SPIKE07_IPV6, TTL("10m")),
-  A("api", SPIKE07_IPV4, TTL("10m")),
-  AAAA("api", SPIKE07_IPV6, TTL("10m")),
-  A("maps", SPIKE07_IPV4, TTL("10m")),
-  AAAA("maps", SPIKE07_IPV6, TTL("10m")),
-  A("mapz", SPIKE07_IPV4, TTL("10m")),
-  AAAA("mapz", SPIKE07_IPV6, TTL("10m")),
+  // A("@", SPIKE07_IPV4, TTL("10m")),
+  // AAAA("@", SPIKE07_IPV6, TTL("10m")),
+  // A("www", SPIKE07_IPV4, TTL("10m")),
+  // AAAA("www", SPIKE07_IPV6, TTL("10m")),
+  // A("api", SPIKE07_IPV4, TTL("10m")),
+  // AAAA("api", SPIKE07_IPV6, TTL("10m")),
+  // A("maps", SPIKE07_IPV4, TTL("10m")),
+  // AAAA("maps", SPIKE07_IPV6, TTL("10m")),
+  // A("mapz", SPIKE07_IPV4, TTL("10m")),
+  // AAAA("mapz", SPIKE07_IPV6, TTL("10m")),

   A("spike-07.ams", SPIKE07_INTERNAL),
   A("spike-07.oob", SPIKE07_OOB),
 
   A("spike-07.ams", SPIKE07_INTERNAL),
   A("spike-07.oob", SPIKE07_OOB),
 


@@ -341,13 +334,18 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("necrosan", NECROSAN_IPV4),
   AAAA("necrosan", NECROSAN_IPV6),
 
   A("necrosan", NECROSAN_IPV4),
   AAAA("necrosan", NECROSAN_IPV6),
 

-  CNAME("tile", "dualstack.k.sni.global.fastly.net.", TTL("10m")),
-  CNAME("a.tile", "dualstack.k.sni.global.fastly.net.", TTL("10m")),
-  CNAME("b.tile", "dualstack.k.sni.global.fastly.net.", TTL("10m")),
-  CNAME("c.tile", "dualstack.k.sni.global.fastly.net.", TTL("10m")),
+  CNAME("tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
+  CNAME("a.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
+  CNAME("b.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
+  CNAME("c.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),

   // Fastly DNS based ACME Challenge requirement
   CNAME("_acme-challenge.tile", "bxve5ryiwwv7woiraq.fastly-validations.com.", TTL("10m")),
 
   // Fastly DNS based ACME Challenge requirement
   CNAME("_acme-challenge.tile", "bxve5ryiwwv7woiraq.fastly-validations.com.", TTL("10m")),
 

+  A("render", CULEBRE_IPV4),
+  A("render", NIDHOGG_IPV4),
+  AAAA("render", CULEBRE_IPV6),
+  AAAA("render", NIDHOGG_IPV6),
+

   // Services machine
 
   A("ironbelly", IRONBELLY_IPV4),
   // Services machine
 
   A("ironbelly", IRONBELLY_IPV4),


@@ -529,6 +527,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Out of band access servers
 
 
   // Out of band access servers
 

+  A("oob1.ams", OOB1AMS_INTERNAL),
+

   A("oob1.dub", OOB1DUB_INTERNAL),
 
   // Bytemark machine, and the services which operate from it
   A("oob1.dub", OOB1DUB_INTERNAL),
 
   // Bytemark machine, and the services which operate from it


@@ -541,18 +541,25 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("mta-sts", SHENRON_IPV6),
   A("lists", SHENRON_IPV4),
   AAAA("lists", SHENRON_IPV6),
   AAAA("mta-sts", SHENRON_IPV6),
   A("lists", SHENRON_IPV4),
   AAAA("lists", SHENRON_IPV6),

-  A("svn", SHENRON_IPV4),
-  AAAA("svn", SHENRON_IPV6),
-  A("trac", SHENRON_IPV4),
-  AAAA("trac", SHENRON_IPV6),
-  A("irc", SHENRON_IPV4),
-  AAAA("irc", SHENRON_IPV6),

   A("help", SHENRON_IPV4),
   AAAA("help", SHENRON_IPV6),
   A("help", SHENRON_IPV4),
   AAAA("help", SHENRON_IPV6),

-  A("blogs", SHENRON_IPV4, TTL("10m")),
-  AAAA("blogs", SHENRON_IPV6, TTL("10m")),

   A("shenron.bm", SHENRON_INTERNAL),
 
   A("shenron.bm", SHENRON_INTERNAL),
 

+  // Lockheed service
+
+  A("lockheed", LOCKHEED_IPV4),
+  AAAA("lockheed", LOCKHEED_IPV6),
+  A("svn", LOCKHEED_IPV4),
+  AAAA("svn", LOCKHEED_IPV6),
+  A("trac", LOCKHEED_IPV4),
+  AAAA("trac", LOCKHEED_IPV6),
+  A("irc", LOCKHEED_IPV4),
+  AAAA("irc", LOCKHEED_IPV6),
+  A("blogs", LOCKHEED_IPV4),
+  AAAA("blogs", LOCKHEED_IPV6),
+  A("lockheed.ams", LOCKHEED_INTERNAL),
+  A("lockheed.oob", LOCKHEED_OOB),
+

   // Wiki servers
 
   A("tabaluga", TABALUGA_IPV4),
   // Wiki servers
 
   A("tabaluga", TABALUGA_IPV4),


@@ -668,10 +675,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("naga", NAGA_IPV6),
   A("naga.dub", NAGA_INTERNAL),
   A("naga.oob", NAGA_OOB),
   AAAA("naga", NAGA_IPV6),
   A("naga.dub", NAGA_INTERNAL),
   A("naga.oob", NAGA_OOB),

-  A("lockheed", LOCKHEED_IPV4),
-  AAAA("lockheed", LOCKHEED_IPV6),
-  A("lockheed.ams", LOCKHEED_INTERNAL),
-  A("lockheed.oob", LOCKHEED_OOB),

 
   // Discourse server ("community")
   A("jakelong", JAKELONG_IPV4),
 
   // Discourse server ("community")
   A("jakelong", JAKELONG_IPV4),