Fix some DNS errors

diff --git a/dnsconfig.js b/dnsconfig.js
index 64efbf575eaa1ac778d33b097ef6c7cba0a0b2f6..787339658d5775aef721add6e7113f58c7a94cc7 100644 (file)
--- a/dnsconfig.js
+++ b/dnsconfig.js
@@ -58,8 +58,8 @@ OPENSTREETMAP_UK("openstreetmap.co.uk", REG_GANDI);
 
 var OPENSTREETMAP_ZA = loadTemplate("openstreetmap-za");
 
-OPENSTREETMAP_UK("openstreetmap.org.za", REG_NONE);
-OPENSTREETMAP_UK("osm.org.za", REG_NONE);
+OPENSTREETMAP_ZA("openstreetmap.org.za", REG_NONE);
+OPENSTREETMAP_ZA("osm.org.za", REG_NONE);
 
 var OSMFOUNDATION = loadTemplate("osmfoundation");
 
@@ -73,7 +73,7 @@ STATEOFTHEMAP("sotm.org", REG_GANDI);
 
 var STATEOFTHEMAP_EU = loadTemplate("stateofthemap-eu");
 
-STATEOFTHEMAP("stateofthemap.eu", REG_GANDI);
+STATEOFTHEMAP_EU("stateofthemap.eu", REG_GANDI);
 
 var OPENGEODATA = loadTemplate("opengeodata");
 

diff --git a/src/openstreetmap-za.js b/src/openstreetmap-za.js
index a7a415073d14ef17325782eacafad007508049b4..8438475cebaa9778bbfcc462455cb822b9fab975 100644 (file)
--- a/src/openstreetmap-za.js
+++ b/src/openstreetmap-za.js
@@ -58,6 +58,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("b.namibia-topo", "178.250.74.36", TTL("30m")),
   AAAA("b.namibia-topo", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("30m")),
   A("c.namibia-topo", "178.250.74.36", TTL("30m")),
-  AAAA("c.namibia-topo", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("30m")),
+  AAAA("c.namibia-topo", "2a02:1658:4:0:dad3:85ff:fe5d:875e", TTL("30m"))
 
 );

diff --git a/src/stateofthemap-eu.js b/src/stateofthemap-eu.js
new file mode 100644 (file)
index 0000000..4e83e5d
--- /dev/null
+++ b/src/stateofthemap-eu.js
@@ -0,0 +1,18 @@
+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"),
+
+  // Let openstreetmap.at handle email
+
+  MX("@", 1, "openstreetmap.at.", TTL("1h")),
+
+  // Main web server and it's aliases
+
+  A("@", "88.198.206.107", TTL("10m")),
+  A("www", "88.198.206.107", TTL("10m"))
+
+);