X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/6f06019f242f321727eba9ee1b97b890fbdf4ecd..4106a664f26f7b2b3b824d33e468a43a30b2c264:/src/openstreetmap.js

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index 3354a0a..13a9461 100644
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -176,36 +176,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("spike-03.dub", SPIKE03_INTERNAL),
   A("spike-03.oob", SPIKE03_OOB),
 
-  A("spike-04", SPIKE04_IPV4),
-  AAAA("spike-04", SPIKE04_IPV6),
-  // A("@", SPIKE04_IPV4),
-  // AAAA("@", SPIKE04_IPV6),
-  // A("www", SPIKE04_IPV4),
-  // AAAA("www", SPIKE04_IPV6),
-  // A("api", SPIKE04_IPV4),
-  // AAAA("api", SPIKE04_IPV6),
-  // A("maps", SPIKE04_IPV4),
-  // AAAA("maps", SPIKE04_IPV6),
-  // A("mapz", SPIKE04_IPV4),
-  // AAAA("mapz", SPIKE04_IPV6),
-  A("spike-04.bm", SPIKE04_INTERNAL),
-  A("spike-04.oob", SPIKE04_OOB),
-
-  A("spike-05", SPIKE05_IPV4),
-  AAAA("spike-05", SPIKE05_IPV6),
-  // A("@", SPIKE05_IPV4),
-  // AAAA("@", SPIKE05_IPV6),
-  // A("www", SPIKE05_IPV4),
-  // AAAA("www", SPIKE05_IPV6),
-  // A("api", SPIKE05_IPV4),
-  // AAAA("api", SPIKE05_IPV6),
-  // A("maps", SPIKE05_IPV4),
-  // AAAA("maps", SPIKE05_IPV6),
-  // A("mapz", SPIKE05_IPV4),
-  // AAAA("mapz", SPIKE05_IPV6),
-  A("spike-05.bm", SPIKE05_INTERNAL),
-  A("spike-05.oob", SPIKE05_OOB),
-
   A("spike-06", SPIKE06_IPV4),
   AAAA("spike-06", SPIKE06_IPV6),
   A("@", SPIKE06_IPV4),
@@ -253,10 +223,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Nominatim servers
 
-  A("pummelzacken", PUMMELZACKEN_IPV4),
-  A("pummelzacken.ucl", PUMMELZACKEN_INTERNAL),
-  A("pummelzacken.oob", PUMMELZACKEN_OOB),
-
   A("dulcy", DULCY_IPV4),
   AAAA("dulcy", DULCY_IPV6),
   A("dulcy.ams", DULCY_INTERNAL),
@@ -271,6 +237,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("stormfly-04", STORMFLY04_IPV6),
   A("stormfly-04.oob", STORMFLY04_OOB),
 
+  A("vhagar", VHAGAR_IPV4),
+  AAAA("vhagar", VHAGAR_IPV6),
+  A("vhagar.ams", VHAGAR_INTERNAL),
+  A("vhagar.oob", VHAGAR_OOB),
+
   CNAME("nominatim", "nominatim.geo.openstreetmap.org."),
   CNAME("qgis.nominatim", "nominatim.geo.openstreetmap.org."),
   CNAME("qa-tile.nominatim", "longma.openstreetmap.org."),
@@ -436,11 +407,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Matomo server
 
-  A("eustace", EUSTACE_IPV4),
-  A("matomo", EUSTACE_IPV4),
-  A("piwik", EUSTACE_IPV4),
-  A("eustace.ucl", EUSTACE_INTERNAL),
-  A("eustace.oob", EUSTACE_OOB),
+  A("smaug", SMAUG_IPV4),
+  AAAA("smaug", SMAUG_IPV6),
+  A("matomo", SMAUG_IPV4),
+  AAAA("matomo", SMAUG_IPV6),
+  A("piwik", SMAUG_IPV4),
+  AAAA("piwik", SMAUG_IPV6),
+  A("smaug.dub", SMAUG_INTERNAL),
+  A("smaug.oob", SMAUG_OOB),
 
   // Imagery servers
 
@@ -468,13 +442,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("c.os", KESSIE_IPV6, TTL("1h")),
   A("kessie.oob", KESSIE_OOB),
 
-  // Munin server
-
-  A("urmel", URMEL_IPV4),
-  A("munin", URMEL_IPV4),
-  A("urmel.ucl", URMEL_INTERNAL),
-  A("urmel.oob", URMEL_OOB),
-
   // Prometheus server
 
   A("stormfly-03", STORMFLY03_IPV4),
@@ -546,20 +513,22 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("help", SHENRON_IPV4),
   AAAA("help", SHENRON_IPV6),
 
-  // Lockheed service
-
-  A("lockheed", LOCKHEED_IPV4),
-  AAAA("lockheed", LOCKHEED_IPV6),
-  A("svn", LOCKHEED_IPV4),
-  AAAA("svn", LOCKHEED_IPV6),
-  A("trac", LOCKHEED_IPV4),
-  AAAA("trac", LOCKHEED_IPV6),
-  A("irc", LOCKHEED_IPV4),
-  AAAA("irc", LOCKHEED_IPV6),
-  A("blogs", LOCKHEED_IPV4),
-  AAAA("blogs", LOCKHEED_IPV6),
-  A("lockheed.ams", LOCKHEED_INTERNAL),
-  A("lockheed.oob", LOCKHEED_OOB),
+  // Naga service
+
+  A("naga", NAGA_IPV4),
+  AAAA("naga", NAGA_IPV6),
+  A("svn", NAGA_IPV4),
+  AAAA("svn", NAGA_IPV6),
+  A("trac", NAGA_IPV4),
+  AAAA("trac", NAGA_IPV6),
+  A("irc", NAGA_IPV4),
+  AAAA("irc", NAGA_IPV6),
+  A("blogs", NAGA_IPV4),
+  AAAA("blogs", NAGA_IPV6),
+  A("munin", NAGA_IPV4),
+  AAAA("munin", NAGA_IPV6),
+  A("naga.dub", NAGA_INTERNAL),
+  A("naga.oob", NAGA_OOB),
 
   // Wiki servers
 
@@ -593,6 +562,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("noquiklos.ucl", NOQUIKLOS_INTERNAL),
   A("noquiklos.oob", NOQUIKLOS_OOB),
 
+  A("muirdris", MUIRDRIS_IPV4),
+  AAAA("muirdris", MUIRDRIS_IPV6),
+  A("muirdris.dub", MUIRDRIS_INTERNAL),
+  A("muirdris.oob", MUIRDRIS_OOB),
+
   // Tile cache servers
 
   A("gorynych", GORYNYCH_IPV4),
@@ -625,19 +599,25 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Spare
 
+  A("dribble", DRIBBLE_IPV4),
+  AAAA("dribble", DRIBBLE_IPV6),
+  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("naga", NAGA_IPV4),
-  AAAA("naga", NAGA_IPV6),
-  A("naga.dub", NAGA_INTERNAL),
-  A("naga.oob", NAGA_OOB),
+  A("pummelzacken", PUMMELZACKEN_IPV4),
+  A("pummelzacken.ucl", PUMMELZACKEN_INTERNAL),
+  A("pummelzacken.oob", PUMMELZACKEN_OOB),
 
   A("sarel", SAREL_IPV4),
   A("sarel.ucl", SAREL_INTERNAL),
   A("sarel.oob", SAREL_OOB),
+  // Temporary name for discourse fluxbb import test
+  A("forum-import-test", SAREL_IPV4),
 
   // Discourse server ("community")
 
@@ -645,8 +625,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("jakelong", JAKELONG_IPV6),
   A("community", JAKELONG_IPV4),
   A("communities", JAKELONG_IPV4),
+  A("c", JAKELONG_IPV4),
   AAAA("community", JAKELONG_IPV6),
   AAAA("communities", JAKELONG_IPV6),
+  AAAA("c", JAKELONG_IPV6),
   A("jakelong.dub", JAKELONG_INTERNAL),
   A("jakelong.oob", JAKELONG_OOB),
   CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."),