From 6a620ed4fb266cc94e26f385a7d4e46b8b9ab07c Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 9 Nov 2023 09:37:56 +0000
Subject: [PATCH] Revert openstreetmap.io to standard configuration

---
 dnsconfig.js            |  5 +----
 src/openstreetmap-io.js | 44 -----------------------------------------
 2 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 src/openstreetmap-io.js

diff --git a/dnsconfig.js b/dnsconfig.js
index 2817571..9bd7ce7 100644
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -55,6 +55,7 @@ OPENSTREETMAP("openstreetmap.gay", REG_GANDI);
 OPENSTREETMAP("openstreetmaps.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);
@@ -106,10 +107,6 @@ 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);
diff --git a/src/openstreetmap-io.js b/src/openstreetmap-io.js
deleted file mode 100644
index 59a4306..0000000
--- a/src/openstreetmap-io.js
+++ /dev/null
@@ -1,44 +0,0 @@
-D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
-
-  // https://kb.mailbox.org/service-desk/account-article/how-to-set-up-my-domain-name
-  MX("@", 10, "mxext1.mailbox.org."),
-  MX("@", 10, "mxext2.mailbox.org."),
-  MX("@", 20, "mxext3.mailbox.org."),
-
-  // https://kb.mailbox.org/en/private/custom-domains/spf-dkim-and-dmarc-how-to-improve-spam-reputation-and-avoid-bounces
-  SPF_BUILDER({
-    label: "@",
-    parts: [
-      "v=spf1",
-      "include:mailbox.org",
-      "~all"
-    ]
-  }),
-
-  // https://kb.mailbox.org/en/private/custom-domains/spf-dkim-and-dmarc-how-to-improve-spam-reputation-and-avoid-bounces
-  CNAME("MBO0001._domainkey", "MBO0001._domainkey.mailbox.org."),
-  CNAME("MBO0002._domainkey", "MBO0002._domainkey.mailbox.org."),
-  CNAME("MBO0003._domainkey", "MBO0003._domainkey.mailbox.org."),
-  CNAME("MBO0004._domainkey", "MBO0004._domainkey.mailbox.org."),
-
-  // https://kb.mailbox.org/en/private/custom-domains/how-to-configure-e-mail-clients-automatically-through-dns
-  CNAME("autoconfig", "mailbox.org."),
-  SRV("_autodiscover._tcp", 0, 0, 443, "mailbox.org."),
-
-  // Publish DMARC report-only policy
-  DMARC_BUILDER({
-    policy: "none",
-    rua: [
-      "mailto:openstreetmap-d@dmarc.report-uri.com"
-    ],
-    failureOptions: 1
-  }),
-
-  // https://kb.mailbox.org/en/private/custom-domains/how-to-specify-a-key-server-in-the-srv-record
-  SRV("_hkps._tcp", 1, 1, 443, "pgp.mailbox.org."),
-
-
-  // mailbox.org validation
-  TXT("d00f46a3fde45d06c53f3cd5b21f213ea384e7f5", "6d4584a5987b1d97e691d9664107c604e53e083e")
-
-);
\ No newline at end of file
-- 
2.39.5