Restore spike-07 and drop spike-06

[dns.git] / dnsconfig.js

diff --git a/dnsconfig.js b/dnsconfig.js
index a2b012bc4c928bd2bf55bbb329eb8630a23905c9..e2e9c342befd43592d00c08026c7e88208972355 100644 (file)
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -1,10 +1,6 @@
-var REG_NONE = NewRegistrar("none", "NONE");
-var REG_GANDI = NewRegistrar("gandi_v5", "GANDI_V5");
-var PROVIDER = NewDnsProvider("cloudflare", "CLOUDFLAREAPI");
-
-var CF_TTL_ANY = TTL(1);
-
-DEFAULTS(DefaultTTL("24h"));
+var REG_NONE = NewRegistrar("none");
+var REG_GANDI = NewRegistrar("gandi_v5");
+var PROVIDER = NewDnsProvider("cloudflare");

 
 var DOMAIN;
 var REGISTRAR;
 
 var DOMAIN;
 var REGISTRAR;


@@ -28,30 +24,64 @@ function loadTemplate(template) {
   };
 }
 
   };
 }
 

+require("src/hosts.js");
+

 var OPENSTREETMAP = loadTemplate("openstreetmap");
 
 require("include/sshfp.js");
 var OPENSTREETMAP = loadTemplate("openstreetmap");
 
 require("include/sshfp.js");

-require("include/tile.js");
-require("include/render.js");
+require("include/nominatim.js");
+
+try {
+  require("include/geo.js");
+} catch (e) {
+  var GEO_NS_RECORDS = [];
+}
+
+OPENSTREETMAP_ORG_RECORDS = [
+  CNAME("_acme-challenge.tile", "bxve5ryiwwv7woiraq.fastly-validations.com.", TTL("10m"))
+]

 
 

-OPENSTREETMAP("openstreetmap.org", REG_GANDI, SSHFP_RECORDS, TILE_RECORDS, RENDER_RECORDS);
+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.com", REG_GANDI);
 OPENSTREETMAP("openstreetmap.net", REG_GANDI);
 OPENSTREETMAP("openstreetmap.ca", REG_GANDI);
 OPENSTREETMAP("openstreetmap.eu", REG_NONE);
 OPENSTREETMAP("openstreetmap.pro", REG_GANDI);
 OPENSTREETMAP("openstreetmap.com", REG_GANDI);
 OPENSTREETMAP("openstreetmap.net", REG_GANDI);
 OPENSTREETMAP("openstreetmap.ca", REG_GANDI);
 OPENSTREETMAP("openstreetmap.eu", REG_NONE);
 OPENSTREETMAP("openstreetmap.pro", REG_GANDI);

+OPENSTREETMAP("openstreetmap.gay", REG_GANDI);

 OPENSTREETMAP("openstreetmaps.org", REG_GANDI);
 OPENSTREETMAP("openstreetmaps.org", REG_GANDI);

-OPENSTREETMAP("osm.org", REG_GANDI);
+OPENSTREETMAP("osm.org", REG_GANDI, OSM_ORG_RECORDS, SSHFP_RECORDS);

 OPENSTREETMAP("openmaps.org", REG_GANDI);
 OPENSTREETMAP("openstreetmap.io", REG_GANDI);
 OPENSTREETMAP("osm.io", REG_GANDI);
 OPENSTREETMAP("openstreetmap.li", REG_GANDI);
 OPENSTREETMAP("openmaps.org", REG_GANDI);
 OPENSTREETMAP("openstreetmap.io", REG_GANDI);
 OPENSTREETMAP("osm.io", REG_GANDI);
 OPENSTREETMAP("openstreetmap.li", REG_GANDI);

-OPENSTREETMAP("osm.li", REG_GANDI);

 OPENSTREETMAP("openworldmap.org", REG_GANDI);
 OPENSTREETMAP("freeosm.org", REG_GANDI);
 OPENSTREETMAP("open-maps.org", REG_GANDI);
 OPENSTREETMAP("open-maps.com", REG_GANDI);
 OPENSTREETMAP("osmbugs.org", REG_GANDI);
 OPENSTREETMAP("openworldmap.org", REG_GANDI);
 OPENSTREETMAP("freeosm.org", REG_GANDI);
 OPENSTREETMAP("open-maps.org", REG_GANDI);
 OPENSTREETMAP("open-maps.com", REG_GANDI);
 OPENSTREETMAP("osmbugs.org", REG_GANDI);

+OPENSTREETMAP("openstreetmap.ai", REG_GANDI);
+OPENSTREETMAP("openstreetmap.am", REG_GANDI);
+OPENSTREETMAP("openstreetmap.fi", REG_GANDI);
+OPENSTREETMAP("openstreetmap.gr", REG_GANDI);
+OPENSTREETMAP("openstreetmap.me", REG_GANDI);
+OPENSTREETMAP("openstreetmap.mx", REG_GANDI);
+OPENSTREETMAP("openstreetmap.nz", REG_GANDI);
+OPENSTREETMAP("openstreetmap.pe", REG_GANDI);
+OPENSTREETMAP("openstreetmap.ph", REG_GANDI);
+OPENSTREETMAP("openstreetmap.sg", REG_GANDI);
+OPENSTREETMAP("openstreetmap.tv", REG_GANDI);
+OPENSTREETMAP("openstreetmap.wales", REG_GANDI);
+OPENSTREETMAP("openstreetmapdata.org", REG_GANDI);
+// Disable due to registration issue
+// OPENSTREETMAP("openstreetmap.al", REG_NONE);
+
+var OSM_LI = loadTemplate("osm-li");
+
+OSM_LI("osm.li", REG_GANDI);

 
 var OPENSTREETMAP_UK = loadTemplate("openstreetmap-uk");
 
 
 var OPENSTREETMAP_UK = loadTemplate("openstreetmap-uk");
 


@@ -74,15 +104,32 @@ STATEOFTHEMAP("stateofthemap.org", REG_GANDI);
 STATEOFTHEMAP("stateofthemap.com", REG_GANDI);
 STATEOFTHEMAP("sotm.org", REG_GANDI);
 
 STATEOFTHEMAP("stateofthemap.com", REG_GANDI);
 STATEOFTHEMAP("sotm.org", REG_GANDI);
 

-var STATEOFTHEMAP_EU = loadTemplate("stateofthemap-eu");

 
 

-STATEOFTHEMAP_EU("stateofthemap.eu", REG_GANDI);
+// Domain Owner Issue / Registration Issues - Disable for the moment. 31 May 2021
+// var STATEOFTHEMAP_EU = loadTemplate("stateofthemap-eu");
+// STATEOFTHEMAP_EU("stateofthemap.eu", REG_GANDI);

 
 var OPENGEODATA = loadTemplate("opengeodata");
 
 var OPENGEODATA = loadTemplate("opengeodata");

-

 OPENGEODATA("opengeodata.org", REG_GANDI);
 
 var SWITCH2OSM = loadTemplate("switch2osm");
 
 SWITCH2OSM("switch2osm.org", REG_GANDI);
 SWITCH2OSM("switch2osm.com", REG_GANDI);
 OPENGEODATA("opengeodata.org", REG_GANDI);
 
 var SWITCH2OSM = loadTemplate("switch2osm");
 
 SWITCH2OSM("switch2osm.org", REG_GANDI);
 SWITCH2OSM("switch2osm.com", REG_GANDI);

+
+var OSM2PGSQL = loadTemplate("osm2pgsql");
+
+OSM2PGSQL("osm2pgsql.org", REG_GANDI);
+OSM2PGSQL("osm2pgsql.com", REG_GANDI);
+
+var IDEDITOR = loadTemplate("ideditor");
+
+IDEDITOR("ideditor.com", REG_GANDI);
+
+var PTR_EQUINIX_DUB_IPV4 = loadTemplate("ptr_equinix_dub_ipv4");
+
+PTR_EQUINIX_DUB_IPV4("96-27.226.104.184.in-addr.arpa", REG_NONE);
+
+var PTR_EQUINIX_DUB_IPV6 = loadTemplate("ptr_equinix_dub_ipv6");
+
+PTR_EQUINIX_DUB_IPV6(REV("2001:470:1:b3b::/64"), REG_NONE);