Replace dynamic records logic with D_EXTEND

diff --git a/dnsconfig.js b/dnsconfig.js
index 77f9c0cd9630d2381e3ac4fe5984a9a922ee6e39..85c2f2d4cb3fb3e46c8f2f454ec256c140b1d0f7 100644 (file)
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -14,11 +14,6 @@ function loadTemplate(template) {
   return function (domain, registrar) {
     DOMAIN = domain;
     REGISTRAR = registrar;
   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/" + template + ".js");
   };


@@ -40,15 +35,7 @@ try {
   var GEO_NS_RECORDS = [];
 }
 
   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);
 OPENSTREETMAP("openstreetmap.com", REG_GANDI);
 OPENSTREETMAP("openstreetmap.net", REG_GANDI);
 OPENSTREETMAP("openstreetmap.ca", REG_GANDI);


@@ -56,7 +43,7 @@ OPENSTREETMAP("openstreetmap.eu", REG_NONE);
 OPENSTREETMAP("openstreetmap.pro", REG_GANDI);
 OPENSTREETMAP("openstreetmap.gay", REG_GANDI);
 OPENSTREETMAP("openstreetmaps.org", REG_GANDI);
 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);
 OPENSTREETMAP("openmaps.org", REG_GANDI);
 OPENSTREETMAP("openstreetmap.io", REG_GANDI);
 OPENSTREETMAP("osm.io", REG_GANDI);


@@ -84,6 +71,20 @@ OPENSTREETMAP("openstreetmap.org.nz", REG_GANDI);
 // Disable due to registration issue
 // OPENSTREETMAP("openstreetmap.al", REG_NONE);
 
 // Disable due to registration issue
 // OPENSTREETMAP("openstreetmap.al", REG_NONE);
 

+D_EXTEND("openstreetmap.org",
+  CNAME("_acme-challenge.tile", "bxve5ryiwwv7woiraq.fastly-validations.com.", TTL("10m")),
+
+  SSHFP_RECORDS,
+  GEO_NS_RECORDS,
+  NOMINATIM_RECORDS
+);
+
+D_EXTEND("osm.org",
+  CNAME("_acme-challenge.tile", "21gvdfyyxjoc4lmsem.fastly-validations.com.", TTL("10m")),
+
+  SSHFP_RECORDS
+);
+

 // Mastodon redirects to en.osm.town
 var OPENSTREETMAP_TOWN = loadTemplate("openstreetmap-town");
 OPENSTREETMAP_TOWN("openstreetmap.town", REG_GANDI);
 // Mastodon redirects to en.osm.town
 var OPENSTREETMAP_TOWN = loadTemplate("openstreetmap-town");
 OPENSTREETMAP_TOWN("openstreetmap.town", REG_GANDI);

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index cd910b225f1d93fbecf7a3a20517b0b15401e289..6bef817a744025ad4f4557e63ec13bf8cd4a4587 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -805,10 +805,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Uptime site at StatusCake
 
 
   // Uptime site at StatusCake
 

-  CNAME("uptime", "uptimessl-new.statuscake.com."),
-
-  // Dynamic DNS records
-
-  DYNAMIC_RECORDS
+  CNAME("uptime", "uptimessl-new.statuscake.com.")

 
 );
 
 );