Restore spike-07 and drop spike-08

[dns.git] / src / openstreetmap.js

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 28cab3beabf5b06188a2b92a31d2d54ecab3139b..3f417b603a86f2df7304c2b9a7c197922c8946f2 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -223,12 +223,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("@", SPIKE06_IPV6, CF_PROXY_ON),
   A("www", SPIKE06_IPV4, CF_PROXY_ON),
   AAAA("www", SPIKE06_IPV6, 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),
-  AAAA("api", SPIKE06_IPV6),
-  A("maps", SPIKE06_IPV4),
-  AAAA("maps", SPIKE06_IPV6),
-  A("mapz", SPIKE06_IPV4),
-  AAAA("mapz", SPIKE06_IPV6),
+  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-06.ams", SPIKE06_INTERNAL),
   A("spike-06.oob", SPIKE06_OOB),
 


@@ -238,27 +238,27 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("@", SPIKE07_IPV6, CF_PROXY_ON),
   A("www", SPIKE07_IPV4, CF_PROXY_ON),
   AAAA("www", SPIKE07_IPV6, 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),
-  AAAA("api", SPIKE07_IPV6),
-  A("maps", SPIKE07_IPV4),
-  AAAA("maps", SPIKE07_IPV6),
-  A("mapz", SPIKE07_IPV4),
-  AAAA("mapz", SPIKE07_IPV6),
+  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("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),
-  AAAA("api", SPIKE08_IPV6),
-  A("maps", SPIKE08_IPV4),
-  AAAA("maps", SPIKE08_IPV6),
-  A("mapz", SPIKE08_IPV4),
-  AAAA("mapz", 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("spike-08.ams", SPIKE08_INTERNAL),
   A("spike-08.oob", SPIKE08_OOB),
 
   A("spike-08.ams", SPIKE08_INTERNAL),
   A("spike-08.oob", SPIKE08_OOB),
 


@@ -525,6 +525,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("idris", IDRIS_IPV6),
   A("acme", IDRIS_IPV4),
   AAAA("acme", IDRIS_IPV6),
   AAAA("idris", IDRIS_IPV6),
   A("acme", IDRIS_IPV4),
   AAAA("acme", IDRIS_IPV6),

+  A("apt", IDRIS_IPV4),
+  AAAA("apt", IDRIS_IPV6),

   A("chef", IDRIS_IPV4),
   AAAA("chef", IDRIS_IPV6),
   A("dns", IDRIS_IPV4),
   A("chef", IDRIS_IPV4),
   AAAA("chef", IDRIS_IPV6),
   A("dns", IDRIS_IPV4),


@@ -690,15 +692,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Discourse server ("community")
 
 
   // Discourse server ("community")
 

-  A("jakelong", JAKELONG_IPV4),
-  AAAA("jakelong", JAKELONG_IPV6),
+  A("gorwen", GORWEN_IPV4),
+  AAAA("gorwen", GORWEN_IPV6),

 
 

-  A("community", JAKELONG_IPV4),
-  A("communities", JAKELONG_IPV4),
-  A("c", JAKELONG_IPV4),
-  AAAA("community", JAKELONG_IPV6),
-  AAAA("communities", JAKELONG_IPV6),
-  AAAA("c", JAKELONG_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 / SVCB records
   HTTPS("community", 1, ".", "alpn=h2"),


@@ -708,14 +710,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."),
   TXT("community", "google-site-verification=hQ8GZyj4KwnPqAX2oAzpbLrh6I5dfR08PSdL3icVkfg"),
 
   CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."),
   TXT("community", "google-site-verification=hQ8GZyj4KwnPqAX2oAzpbLrh6I5dfR08PSdL3icVkfg"),
 

-  A("forum", JAKELONG_IPV4),
-  AAAA("forum", JAKELONG_IPV6),
+  A("forum", GORWEN_IPV4),
+  AAAA("forum", GORWEN_IPV6),

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

-  A("jakelong.dub", JAKELONG_INTERNAL),
-  A("jakelong.oob", JAKELONG_OOB),
+  A("gorwen.dub", GORWEN_INTERNAL),
+  A("gorwen.oob", GORWEN_OOB),

 
   // Donation site and new OSMF crm site
 
 
   // Donation site and new OSMF crm site