Make fastly ACME CNAMEs domain dependent

diff --git a/dnsconfig.js b/dnsconfig.js
index 184f0dc8ccb11eb678c58f66930f8777e30e4bf8..2be2a472bfc1f92955c0e31d276637def4680704 100644 (file)
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -37,7 +37,15 @@ try {
   var GEO_NS_RECORDS = [];
 }
 
   var GEO_NS_RECORDS = [];
 }
 

-OPENSTREETMAP("openstreetmap.org", REG_GANDI, SSHFP_RECORDS, GEO_NS_RECORDS, NOMINATIM_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);
 OPENSTREETMAP("openstreetmap.com", REG_GANDI);
 OPENSTREETMAP("openstreetmap.net", REG_GANDI);
 OPENSTREETMAP("openstreetmap.ca", REG_GANDI);


@@ -45,7 +53,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);
+OPENSTREETMAP("osm.org", REG_GANDI, OSM_ORG_RECORDS);

 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);

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 33b1cdb2b283f069f3ffeedc6d22350fdc2ef6af..c43c3f0792bbdd92e80dc4b0fb09ed4121cca34d 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -325,8 +325,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   CNAME("a.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
   CNAME("b.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
   CNAME("c.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
   CNAME("a.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
   CNAME("b.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
   CNAME("c.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),

-  // Fastly DNS based ACME Challenge requirement
-  CNAME("_acme-challenge.tile", "bxve5ryiwwv7woiraq.fastly-validations.com.", TTL("10m")),

 
   A("render", CULEBRE_IPV4),
   A("render", NIDHOGG_IPV4),
 
   A("render", CULEBRE_IPV4),
   A("render", NIDHOGG_IPV4),