Minor order tweak

[dns.git] / dnsconfig.js

diff --git a/dnsconfig.js b/dnsconfig.js
index 689af1888705e9fe144b47f6846c8ea79325cc31..a96715e5f0690cdd2d5cd9da567c7efa153ccea8 100644 (file)
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -1,6 +1,6 @@
-var REG_NONE = NewRegistrar("none", "NONE");
-var REG_GANDI = NewRegistrar("gandi_v5", "GANDI_V5");
-var PROVIDER = NewDnsProvider("cloudflare", "CLOUDFLAREAPI");
+var REG_NONE = NewRegistrar("none");
+var REG_GANDI = NewRegistrar("gandi_v5");
+var PROVIDER = NewDnsProvider("cloudflare");

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


@@ -14,26 +14,39 @@ 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");
   };
 }
 

-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");
 
 require("include/sshfp.js");
 
 var OPENSTREETMAP = loadTemplate("openstreetmap");
 
 require("include/sshfp.js");

-require("include/tile.js");
-require("include/render.js");

 require("include/nominatim.js");
 
 require("include/nominatim.js");
 

-OPENSTREETMAP("openstreetmap.org", REG_GANDI, SSHFP_RECORDS, TILE_RECORDS, RENDER_RECORDS, NOMINATIM_RECORDS);
+try {
+  require("include/geo.js");
+} catch (e) {
+  var GEO_NS_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);


@@ -51,6 +64,53 @@ OPENSTREETMAP("freeosm.org", REG_GANDI);
 OPENSTREETMAP("open-maps.org", REG_GANDI);
 OPENSTREETMAP("open-maps.com", REG_GANDI);
 OPENSTREETMAP("osmbugs.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);
+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);
+
+// Domain owned by Amanda McCann
+// osm.town
+
+// Managed independently by Guillaume Rischard
+// openstreetmap.lu
+// osm.lu

 
 var OSM_LI = loadTemplate("osm-li");
 
 
 var OSM_LI = loadTemplate("osm-li");
 


@@ -77,10 +137,13 @@ 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);
 

+// The domain is registation is managed by FOSSGIS.de
+var STATEOFTHEMAP_EU = loadTemplate("stateofthemap-eu");
+STATEOFTHEMAP_EU("stateofthemap.eu", REG_NONE);

 
 

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

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


@@ -94,3 +157,41 @@ var OSM2PGSQL = loadTemplate("osm2pgsql");
 
 OSM2PGSQL("osm2pgsql.org", REG_GANDI);
 OSM2PGSQL("osm2pgsql.com", REG_GANDI);
 
 OSM2PGSQL("osm2pgsql.org", REG_GANDI);
 OSM2PGSQL("osm2pgsql.com", REG_GANDI);

+
+var IDEDITOR = loadTemplate("ideditor");
+
+IDEDITOR("ideditor.com", REG_GANDI);
+
+var OSMWIKI = loadTemplate("osm-wiki");
+OSMWIKI("osm.wiki", REG_GANDI);
+
+var PTR_HE_DUB_IPV4 = loadTemplate("ptr_he_dub_ipv4");
+
+PTR_HE_DUB_IPV4(REV("184.104.226.96/27"), REG_NONE);
+
+var PTR_HE_DUB_IPV6 = loadTemplate("ptr_he_dub_ipv6");
+
+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(REV("82.199.86.96/27"), REG_NONE);
+
+var PTR_EQUINIX_AMS_IPV6 = loadTemplate("ptr_equinix_ams_ipv6");
+
+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(REV("87.252.214.96/27"), REG_NONE);
+
+var PTR_EQUINIX_DUB_IPV6 = loadTemplate("ptr_equinix_dub_ipv6");
+
+PTR_EQUINIX_DUB_IPV6(REV("2001:4d78:fe03:1c::/64"), REG_NONE);
+
+// No immediate plans
+// External DNS and hosting still up
+// freethepostcode.org
+
+// External DNS and hosting
+// openstreetmap.cymru