X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/b5bc114a65ea4f10ebb22f50a59059d2ca216293..c25da1eb264607e0c30da8deb48107c1ec83f33e:/dnsconfig.js?ds=sidebyside

diff --git a/dnsconfig.js b/dnsconfig.js
index 3bf3fe6..2817571 100644
--- 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;
@@ -29,11 +29,23 @@ require("src/hosts.js");
 var OPENSTREETMAP = loadTemplate("openstreetmap");
 
 require("include/sshfp.js");
-require("include/tile.js");
-require("include/render.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_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.com", REG_GANDI);
 OPENSTREETMAP("openstreetmap.net", REG_GANDI);
 OPENSTREETMAP("openstreetmap.ca", REG_GANDI);
@@ -41,9 +53,8 @@ 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);
+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("openworldmap.org", REG_GANDI);
@@ -51,10 +62,8 @@ OPENSTREETMAP("freeosm.org", REG_GANDI);
 OPENSTREETMAP("open-maps.org", REG_GANDI);
 OPENSTREETMAP("open-maps.com", REG_GANDI);
 OPENSTREETMAP("osmbugs.org", REG_GANDI);
-OPENSTREETMAP("freethepostcode.org", REG_GANDI);
 OPENSTREETMAP("openstreetmap.ai", REG_GANDI);
 OPENSTREETMAP("openstreetmap.am", REG_GANDI);
-OPENSTREETMAP("openstreetmap.cymru", REG_GANDI);
 OPENSTREETMAP("openstreetmap.fi", REG_GANDI);
 OPENSTREETMAP("openstreetmap.gr", REG_GANDI);
 OPENSTREETMAP("openstreetmap.me", REG_GANDI);
@@ -66,7 +75,17 @@ OPENSTREETMAP("openstreetmap.sg", REG_GANDI);
 OPENSTREETMAP("openstreetmap.tv", REG_GANDI);
 OPENSTREETMAP("openstreetmap.wales", REG_GANDI);
 OPENSTREETMAP("openstreetmapdata.org", REG_GANDI);
-OPENSTREETMAP("openstreetmap.al", REG_NONE);
+
+// Disable due to registration issue
+// OPENSTREETMAP("openstreetmap.al", REG_NONE);
+
+// Mastodon
+OPENSTREETMAP("openstreetmap.town", REG_GANDI);
+// Pending transfer: OPENSTREETMAP("osm.town", REG_GANDI);
+
+// Managed independently by Guillaume Rischard
+// openstreetmap.lu
+// osm.lu
 
 var OSM_LI = loadTemplate("osm-li");
 
@@ -87,14 +106,18 @@ var OSMFOUNDATION = loadTemplate("osmfoundation");
 
 OSMFOUNDATION("osmfoundation.org", REG_GANDI);
 
+// Domain used for testing osmfoundation.org email hosting replacement
+var OPENSTREETMAP_IO = loadTemplate("openstreetmap-io");
+OPENSTREETMAP_IO("openstreetmap.io", REG_GANDI);
+
 var STATEOFTHEMAP = loadTemplate("stateofthemap");
 
 STATEOFTHEMAP("stateofthemap.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);
 
 var OPENGEODATA = loadTemplate("opengeodata");
@@ -109,3 +132,33 @@ var OSM2PGSQL = loadTemplate("osm2pgsql");
 
 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_EQUINIX_AMS_IPV4 = loadTemplate("ptr_equinix_ams_ipv4");
+
+PTR_EQUINIX_AMS_IPV4("128-27.179.104.184.in-addr.arpa", REG_NONE);
+
+var PTR_EQUINIX_AMS_IPV6 = loadTemplate("ptr_equinix_ams_ipv6");
+
+PTR_EQUINIX_AMS_IPV6(REV("2001:470:1:fa1::/64"), REG_NONE);
+
+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);
+
+// No immediate plans
+// External DNS and hosting still up
+// freethepostcode.org
+
+// External DNS and hosting
+// openstreetmap.cymru