Use correct record type for IPv6

[dns.git] / src / openstreetmap.js

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index f783b0dea485714a0337a509d5ad1470c3ca63c7..7ca0c91a331a5f34fb7c7ae5fa5929e5caa96d57 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -1,3 +1,12 @@
+if ( DOMAIN == "openstreetmap.org" ) {
+  // Custom Domain for https://github.com/osmfoundation/welcome-mat/
+  var WELCOME_DOMAIN = CNAME("welcome", "osmfoundation.github.io.")
+} else {
+  // Github Pages only allows 1 domain name per site.
+  // Avoid Google Pages domain hijack
+  var WELCOME_DOMAIN = CNAME("welcome", "openstreetmap.org.")
+}
+
 D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Publish CAA records indicating that only letsencrypt and globalsign (Fastly) should issue certificates
@@ -23,8 +32,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   MX("noreply", 10, QUALIFY("a.mx")),
   MX("otrs", 10, QUALIFY("a.mx")),
   MX("community", 10, QUALIFY("a.mx")),
-  A("a.mx", SHENRON_IPV4),
-  AAAA("a.mx", SHENRON_IPV6),
+  A("a.mx", FAFNIR_IPV4),
+  AAAA("a.mx", FAFNIR_IPV6),
   A("mail", FAFNIR_IPV4),
   AAAA("mail", FAFNIR_IPV6),
   A("mta-sts", FAFNIR_IPV4),
@@ -348,15 +357,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("horntail.dub", HORNTAIL_INTERNAL),
   A("horntail.oob", HORNTAIL_OOB),
 
-  A("grisu", GRISU_IPV4),
-  AAAA("grisu", GRISU_IPV6),
-  // A("backup", GRISU_IPV4, TTL("10m")),
-  // AAAA("backup", GRISU_IPV6, TTL("10m")),
-  // A("planet", GRISU_IPV4, TTL("10m")),
-  // AAAA("planet", GRISU_IPV6, TTL("10m")),
-  A("grisu.bm", GRISU_INTERNAL),
-  A("grisu.oob", GRISU_OOB),
-
   // Database servers
 
   A("snap-01.ams", SNAP01_INTERNAL),
@@ -529,12 +529,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Wiki servers
 
-  A("tabaluga", TABALUGA_IPV4),
-  AAAA("tabaluga", TABALUGA_IPV6),
-  A("wiki", TABALUGA_IPV4, TTL("10m")),
-  AAAA("wiki", TABALUGA_IPV6, TTL("10m")),
-  A("tabaluga.ams", TABALUGA_INTERNAL),
-  A("tabaluga.oob", TABALUGA_OOB),
+  A("konqi", KONQI_IPV4),
+  AAAA("konqi", KONQI_IPV6),
+  A("wiki", KONQI_IPV4),
+  AAAA("wiki", KONQI_IPV6),
+  A("konqi.dub", KONQI_INTERNAL),
+  A("konqi.oob", KONQI_OOB),
 
   // Overpass server
 
@@ -547,20 +547,24 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // GPS tile server
 
-  A("noquiklos", NOQUIKLOS_IPV4),
-  A("gps-tile", NOQUIKLOS_IPV4),
-  A("a.gps-tile", NOQUIKLOS_IPV4),
-  A("b.gps-tile", NOQUIKLOS_IPV4),
-  A("c.gps-tile", NOQUIKLOS_IPV4),
-  A("gps.tile", NOQUIKLOS_IPV4),
-  A("gps-a.tile", NOQUIKLOS_IPV4),
-  A("gps-b.tile", NOQUIKLOS_IPV4),
-  A("gps-c.tile", NOQUIKLOS_IPV4),
-  A("noquiklos.ucl", NOQUIKLOS_INTERNAL),
-  A("noquiklos.oob", NOQUIKLOS_OOB),
-
   A("muirdris", MUIRDRIS_IPV4),
   AAAA("muirdris", MUIRDRIS_IPV6),
+  A("gps-tile", MUIRDRIS_IPV4),
+  AAAA("gps-tile", MUIRDRIS_IPV6),
+  A("a.gps-tile", MUIRDRIS_IPV4),
+  AAAA("a.gps-tile", MUIRDRIS_IPV6),
+  A("b.gps-tile", MUIRDRIS_IPV4),
+  AAAA("b.gps-tile", MUIRDRIS_IPV6),
+  A("c.gps-tile", MUIRDRIS_IPV4),
+  AAAA("c.gps-tile", MUIRDRIS_IPV6),
+  A("gps.tile", MUIRDRIS_IPV4),
+  AAAA("gps.tile", MUIRDRIS_IPV6),
+  A("gps-a.tile", MUIRDRIS_IPV4),
+  AAAA("gps-a.tile", MUIRDRIS_IPV6),
+  A("gps-b.tile", MUIRDRIS_IPV4),
+  AAAA("gps-b.tile", MUIRDRIS_IPV6),
+  A("gps-c.tile", MUIRDRIS_IPV4),
+  AAAA("gps-c.tile", MUIRDRIS_IPV6),
   A("muirdris.dub", MUIRDRIS_INTERNAL),
   A("muirdris.oob", MUIRDRIS_OOB),
 
@@ -601,10 +605,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("dribble.ams", DRIBBLE_INTERNAL),
   A("dribble.oob", DRIBBLE_OOB),
 
-  A("konqi", KONQI_IPV4),
-  AAAA("konqi", KONQI_IPV6),
-  A("konqi.dub", KONQI_INTERNAL),
-  A("konqi.oob", KONQI_OOB),
+  A("noquiklos", NOQUIKLOS_IPV4),
+  A("noquiklos.ucl", NOQUIKLOS_INTERNAL),
+  A("noquiklos.oob", NOQUIKLOS_OOB),
 
   A("pummelzacken", PUMMELZACKEN_IPV4),
   A("pummelzacken.ucl", PUMMELZACKEN_INTERNAL),
@@ -616,6 +619,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   // Temporary name for discourse fluxbb import test
   A("forum-import-test", SAREL_IPV4),
 
+  A("tabaluga", TABALUGA_IPV4),
+  AAAA("tabaluga", TABALUGA_IPV6),
+  A("tabaluga.ams", TABALUGA_INTERNAL),
+  A("tabaluga.oob", TABALUGA_OOB),
+
   // Discourse server ("community")
 
   A("jakelong", JAKELONG_IPV4),
@@ -639,8 +647,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   CNAME("uptime", "uptimessl-new.statuscake.com."),
 
   // Custom Domain for https://github.com/osmfoundation/welcome-mat/
-
-  CNAME("welcome", "osmfoundation.github.io."),
+  WELCOME_DOMAIN,
 
   // Dynamic DNS records