X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/4106a664f26f7b2b3b824d33e468a43a30b2c264..dabd2d6ece1a681631afa9959e481c0424dbcc36:/src/openstreetmap.js?ds=sidebyside

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 13a9461..b64b998 100644
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -16,15 +16,19 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     ],
   }),
 
-  // Use shenron as the MX host
+  // Mail service
 
   MX("@", 10, QUALIFY("a.mx")),
   MX("messages", 10, QUALIFY("a.mx")),
   MX("noreply", 10, QUALIFY("a.mx")),
   MX("otrs", 10, QUALIFY("a.mx")),
   MX("community", 10, QUALIFY("a.mx")),
-  A("a.mx", SHENRON_IPV4),
-  AAAA("a.mx", SHENRON_IPV6),
+  A("a.mx", FAFNIR_IPV4),
+  AAAA("a.mx", FAFNIR_IPV6),
+  A("mail", FAFNIR_IPV4),
+  AAAA("mail", FAFNIR_IPV6),
+  A("mta-sts", FAFNIR_IPV4),
+  AAAA("mta-sts", FAFNIR_IPV6),
 
   // Publish SPF records indicating that only shenron sends mail
 
@@ -344,15 +348,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("horntail.dub", HORNTAIL_INTERNAL),
   A("horntail.oob", HORNTAIL_OOB),
 
-  A("grisu", GRISU_IPV4),
-  AAAA("grisu", GRISU_IPV6),
-  // A("backup", GRISU_IPV4, TTL("10m")),
-  // AAAA("backup", GRISU_IPV6, TTL("10m")),
-  // A("planet", GRISU_IPV4, TTL("10m")),
-  // AAAA("planet", GRISU_IPV6, TTL("10m")),
-  A("grisu.bm", GRISU_INTERNAL),
-  A("grisu.oob", GRISU_OOB),
-
   // Database servers
 
   A("snap-01.ams", SNAP01_INTERNAL),
@@ -370,9 +365,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("eddie.ucl", EDDIE_INTERNAL),
   A("eddie.oob", EDDIE_OOB),
 
-  A("katla.bm", KATLA_INTERNAL),
-  A("katla.oob", KATLA_OOB),
-
   // Development server with wildcard alias for user sites
 
   A("faffy", FAFFY_IPV4),
@@ -504,10 +496,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   A("shenron", SHENRON_IPV4),
   AAAA("shenron", SHENRON_IPV6),
-  A("mail", SHENRON_IPV4),
-  AAAA("mail", SHENRON_IPV6),
-  A("mta-sts", SHENRON_IPV4),
-  AAAA("mta-sts", SHENRON_IPV6),
   A("lists", SHENRON_IPV4),
   AAAA("lists", SHENRON_IPV6),
   A("help", SHENRON_IPV4),
@@ -532,12 +520,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Wiki servers
 
-  A("tabaluga", TABALUGA_IPV4),
-  AAAA("tabaluga", TABALUGA_IPV6),
-  A("wiki", TABALUGA_IPV4, TTL("10m")),
-  AAAA("wiki", TABALUGA_IPV6, TTL("10m")),
-  A("tabaluga.ams", TABALUGA_INTERNAL),
-  A("tabaluga.oob", TABALUGA_OOB),
+  A("konqi", KONQI_IPV4),
+  AAAA("konqi", KONQI_IPV6),
+  A("wiki", KONQI_IPV4),
+  AAAA("wiki", KONQI_IPV6),
+  A("konqi.dub", KONQI_INTERNAL),
+  A("konqi.oob", KONQI_OOB),
 
   // Overpass server
 
@@ -604,11 +592,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("dribble.ams", DRIBBLE_INTERNAL),
   A("dribble.oob", DRIBBLE_OOB),
 
-  A("konqi", KONQI_IPV4),
-  AAAA("konqi", KONQI_IPV6),
-  A("konqi.dub", KONQI_INTERNAL),
-  A("konqi.oob", KONQI_OOB),
-
   A("pummelzacken", PUMMELZACKEN_IPV4),
   A("pummelzacken.ucl", PUMMELZACKEN_INTERNAL),
   A("pummelzacken.oob", PUMMELZACKEN_OOB),
@@ -619,6 +602,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   // Temporary name for discourse fluxbb import test
   A("forum-import-test", SAREL_IPV4),
 
+  A("tabaluga", TABALUGA_IPV4),
+  AAAA("tabaluga", TABALUGA_IPV6),
+  A("tabaluga.ams", TABALUGA_INTERNAL),
+  A("tabaluga.oob", TABALUGA_OOB),
+
   // Discourse server ("community")
 
   A("jakelong", JAKELONG_IPV4),