Add fume and grisu to DNS

[dns.git] / src / stateofthemap-eu.js

diff --git a/src/stateofthemap-eu.js b/src/stateofthemap-eu.js
index 4e83e5d9ba9b8fe56d5024264de571256fe0dcd5..2a21842993e32a58f0ed76fcedc40cc946faba53 100644 (file)
--- a/src/stateofthemap-eu.js
+++ b/src/stateofthemap-eu.js
@@ -2,17 +2,35 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Publish CAA records indicating that only letsencrypt should issue certificates
 
-  CAA("@", "issue", "letsencrypt.org", CF_TTL_ANY),
-  CAA("@", "issuewild", "letsencrypt.org", CF_TTL_ANY),
-  CAA("@", "iodef", "mailto:hostmaster@openstreetmap.org"),
+  CAA_BUILDER({
+    label: "@",
+    iodef: "mailto:hostmaster@openstreetmap.org",
+    issue: [
+      "letsencrypt.org",
+    ],
+    issuewild: [
+      "letsencrypt.org",
+    ],
+  }),
 
-  // Let openstreetmap.at handle email
+  // Let OSMBE handle email (through Fastmail)
+  // https://www.fastmail.help/hc/en-us/articles/1500000280261
 
-  MX("@", 1, "openstreetmap.at.", TTL("1h")),
+  MX("@", 10, "in1-smtp.messagingengine.com."),
+  MX("@", 20, "in2-smtp.messagingengine.com."),
+  
+  TXT("@", "v=spf1 include:spf.messagingengine.com ?all"),
+  CNAME("fm1._domainkey", "fm1.stateofthemap.eu.dkim.fmhosted.com."),
+  CNAME("fm2._domainkey", "fm2.stateofthemap.eu.dkim.fmhosted.com."),
+  CNAME("fm3._domainkey", "fm3.stateofthemap.eu.dkim.fmhosted.com."),
 
-  // Main web server and it's aliases
-
-  A("@", "88.198.206.107", TTL("10m")),
-  A("www", "88.198.206.107", TTL("10m"))
+  // Site hosted on github pages
 
+  ALIAS("@", "osmbe.github.io."),
+  CNAME("www", "osmbe.github.io."),
+  
+  // Previous editions
+  
+  A("2014", "49.12.5.171")
+  
 );