Minor order tweak

[dns.git] / dnsconfig.js

diff --git a/dnsconfig.js b/dnsconfig.js
index 639192e96bf3c884b27cd0f63c97e4ce9ad45bd9..a96715e5f0690cdd2d5cd9da567c7efa153ccea8 100644 (file)
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -14,17 +14,26 @@ function loadTemplate(template) {
   return function (domain, registrar) {
     DOMAIN = domain;
     REGISTRAR = registrar;
-    DYNAMIC_RECORDS = [];
-
-    for (var i = 2; i < arguments.length; i++) {
-      DYNAMIC_RECORDS = DYNAMIC_RECORDS.concat(arguments[i]);
-    }
 
     require("src/" + template + ".js");
   };
 }
 
-require("src/hosts.js");
+// Ensure that the reverse DNS records are in RFC 4183 notation
+REVCOMPAT("rfc4183");
+
+var IPV4 = require("src/ipv4.json");
+var IPV6 = require("src/ipv6.json");
+
+var HOST_RECORDS = [];
+
+for (var name in IPV4) {
+  HOST_RECORDS.push(A(name, IPV4[name]));
+}
+
+for (var name in IPV6) {
+  HOST_RECORDS.push(AAAA(name, IPV6[name]));
+}
 
 var OPENSTREETMAP = loadTemplate("openstreetmap");
 
@@ -37,15 +46,7 @@ try {
   var GEO_NS_RECORDS = [];
 }
 
-OPENSTREETMAP_ORG_RECORDS = [
-  CNAME("_acme-challenge.tile", "bxve5ryiwwv7woiraq.fastly-validations.com.", TTL("10m"))
-]
-
-OSM_ORG_RECORDS = [
-  CNAME("_acme-challenge.tile", "21gvdfyyxjoc4lmsem.fastly-validations.com.", TTL("10m"))
-]
-
-OPENSTREETMAP("openstreetmap.org", REG_GANDI, OPENSTREETMAP_ORG_RECORDS, SSHFP_RECORDS, GEO_NS_RECORDS, NOMINATIM_RECORDS);
+OPENSTREETMAP("openstreetmap.org", REG_GANDI);
 OPENSTREETMAP("openstreetmap.com", REG_GANDI);
 OPENSTREETMAP("openstreetmap.net", REG_GANDI);
 OPENSTREETMAP("openstreetmap.ca", REG_GANDI);
@@ -53,7 +54,7 @@ OPENSTREETMAP("openstreetmap.eu", REG_NONE);
 OPENSTREETMAP("openstreetmap.pro", REG_GANDI);
 OPENSTREETMAP("openstreetmap.gay", REG_GANDI);
 OPENSTREETMAP("openstreetmaps.org", REG_GANDI);
-OPENSTREETMAP("osm.org", REG_GANDI, OSM_ORG_RECORDS, SSHFP_RECORDS);
+OPENSTREETMAP("osm.org", REG_GANDI);
 OPENSTREETMAP("openmaps.org", REG_GANDI);
 OPENSTREETMAP("openstreetmap.io", REG_GANDI);
 OPENSTREETMAP("osm.io", REG_GANDI);
@@ -76,10 +77,30 @@ OPENSTREETMAP("openstreetmap.sg", REG_GANDI);
 OPENSTREETMAP("openstreetmap.tv", REG_GANDI);
 OPENSTREETMAP("openstreetmap.wales", REG_GANDI);
 OPENSTREETMAP("openstreetmapdata.org", REG_GANDI);
+OPENSTREETMAP("openstreetmap.org.nz", REG_GANDI);
 
 // Disable due to registration issue
 // OPENSTREETMAP("openstreetmap.al", REG_NONE);
 
+D_EXTEND("openstreetmap.org",
+  CNAME("_acme-challenge.tile", "bxve5ryiwwv7woiraq.fastly-validations.com.", TTL("10m")),
+
+  // Uptime site at StatusCake
+  CNAME("uptime", "uptimessl-new.statuscake.com."),
+
+  HOST_RECORDS,
+  SSHFP_RECORDS,
+  GEO_NS_RECORDS,
+  NOMINATIM_RECORDS
+);
+
+D_EXTEND("osm.org",
+  CNAME("_acme-challenge.tile", "21gvdfyyxjoc4lmsem.fastly-validations.com.", TTL("10m")),
+
+  HOST_RECORDS,
+  SSHFP_RECORDS
+);
+
 // Mastodon redirects to en.osm.town
 var OPENSTREETMAP_TOWN = loadTemplate("openstreetmap-town");
 OPENSTREETMAP_TOWN("openstreetmap.town", REG_GANDI);
@@ -146,7 +167,7 @@ OSMWIKI("osm.wiki", REG_GANDI);
 
 var PTR_HE_DUB_IPV4 = loadTemplate("ptr_he_dub_ipv4");
 
-PTR_HE_DUB_IPV4("96-27.226.104.184.in-addr.arpa", REG_NONE);
+PTR_HE_DUB_IPV4(REV("184.104.226.96/27"), REG_NONE);
 
 var PTR_HE_DUB_IPV6 = loadTemplate("ptr_he_dub_ipv6");
 
@@ -154,7 +175,7 @@ PTR_HE_DUB_IPV6(REV("2001:470:1:b3b::/64"), REG_NONE);
 
 var PTR_EQUINIX_AMS_IPV4 = loadTemplate("ptr_equinix_ams_ipv4");
 
-PTR_EQUINIX_AMS_IPV4("96-27.86.199.82.in-addr.arpa", REG_NONE);
+PTR_EQUINIX_AMS_IPV4(REV("82.199.86.96/27"), REG_NONE);
 
 var PTR_EQUINIX_AMS_IPV6 = loadTemplate("ptr_equinix_ams_ipv6");
 
@@ -162,7 +183,7 @@ PTR_EQUINIX_AMS_IPV6(REV("2001:4d78:500:5e3::/64"), REG_NONE);
 
 var PTR_EQUINIX_DUB_IPV4 = loadTemplate("ptr_equinix_dub_ipv4");
 
-PTR_EQUINIX_DUB_IPV4("96-27.214.252.87.in-addr.arpa", REG_NONE);
+PTR_EQUINIX_DUB_IPV4(REV("87.252.214.96/27"), REG_NONE);
 
 var PTR_EQUINIX_DUB_IPV6 = loadTemplate("ptr_equinix_dub_ipv6");