From: Tom Hughes <tom@compton.nu>
Date: Tue, 30 Aug 2022 18:08:23 +0000 (+0100)
Subject: Make fastly ACME CNAMEs domain dependent
X-Git-Url: https://git.openstreetmap.org/dns.git/commitdiff_plain/ff878aedd31e0d7f9bd9d93b4ac409c22b14e147?hp=f16c035f3c9f60b131892ac18a5f87a987a0f1b7

Make fastly ACME CNAMEs domain dependent
---

diff --git a/dnsconfig.js b/dnsconfig.js
index 184f0dc..2be2a47 100644
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -37,7 +37,15 @@ try {
   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);
@@ -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("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);
diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 33b1cdb..c43c3f0 100644
--- 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")),
-  // Fastly DNS based ACME Challenge requirement
-  CNAME("_acme-challenge.tile", "bxve5ryiwwv7woiraq.fastly-validations.com.", TTL("10m")),
 
   A("render", CULEBRE_IPV4),
   A("render", NIDHOGG_IPV4),