X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/cd15c26539b30cf3abd4a16283300f91f857f70c..64a29f60ee63a010d5ebfc8ec543a0ad9e195e32:/src/openstreetmap.js

diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index f847a08..b25f697 100644
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -51,7 +51,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   NS("geo", QUALIFY("balerion")),
   NS("geo", QUALIFY("chrysophylax")),
-  NS("geo", QUALIFY("katie")),
   NS("geo", QUALIFY("saphira")),
   NS("geo", QUALIFY("stormfly-04")),
   NS("geo", QUALIFY("ridgeback")),
@@ -135,10 +134,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Rails application servers
 
-  A("thorn-01.ams", THORN01_INTERNAL),
-  A("rails1.ams", THORN01_INTERNAL),
-  A("thorn-01.oob", THORN01_OOB),
-
   A("thorn-02.ams", THORN02_INTERNAL),
   A("rails2.ams", THORN02_INTERNAL),
   A("thorn-02.oob", THORN02_OOB),
@@ -166,7 +161,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("dulcy.ams", DULCY_INTERNAL),
   A("dulcy.oob", DULCY_OOB),
 
+  A("stormfly-04", STORMFLY04_IPV4),
+  AAAA("stormfly-04", STORMFLY04_IPV6),
+  A("stormfly-04.oob", STORMFLY04_OOB),
+
   CNAME("nominatim", "nominatim.geo.openstreetmap.org."),
+  CNAME("qgis.nominatim", "nominatim.geo.openstreetmap.org."),
 
   // Taginfo server
 
@@ -202,6 +202,8 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   A("bowser", BOWSER_IPV4),
 
+  A("balerion", BALERION_IPV4),
+
   A("albi", ALBI_IPV4),
   AAAA("albi", ALBI_IPV6),
 
@@ -321,7 +323,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Prometheus server
 
-  A("prometheus", TIAMAT11_IPV4),
+  A("stormfly-03", STORMFLY03_IPV4),
+  AAAA("stormfly-03", STORMFLY03_IPV6),
+  A("prometheus", STORMFLY03_IPV4, TTL("10m")),
+  AAAA("prometheus", STORMFLY03_IPV6, TTL("10m")),
+  A("stormfly-03.oob", STORMFLY03_OOB),
 
   // Chef server
 
@@ -341,6 +347,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("clifford.ucl", CLIFFORD_INTERNAL),
   A("clifford.oob", CLIFFORD_OOB),
 
+  // Discourse server
+
+  A("lockheed", LOCKHEED_IPV4),
+  AAAA("lockheed", LOCKHEED_IPV6),
+  A("lockheed.ams", LOCKHEED_INTERNAL),
+  A("lockheed.oob", LOCKHEED_OOB),
+
   // KVMs
 
   A("kvm1.ucl", KVM1_INTERNAL),
@@ -410,8 +423,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ridgeback.oob", RIDGEBACK_OOB),
   A("nepomuk", NEPOMUK_IPV4),
   AAAA("nepomuk", NEPOMUK_IPV6),
-  A("katie", KATIE_IPV4),
-  AAAA("katie", KATIE_IPV6),
   A("longma", LONGMA_IPV4),
   AAAA("longma", LONGMA_IPV6),
   A("viserion", VISERION_IPV4),
@@ -424,17 +435,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("toothless", TOOTHLESS_IPV6),
   A("sarkany", SARKANY_IPV4),
   AAAA("sarkany", SARKANY_IPV6),
-  A("cmok", CMOK_IPV4),
-  AAAA("cmok", CMOK_IPV6),
-  A("stormfly-03", STORMFLY03_IPV4),
-  AAAA("stormfly-03", STORMFLY03_IPV6),
-  A("stormfly-03.oob", STORMFLY03_OOB),
-  A("stormfly-04", STORMFLY04_IPV4),
-  AAAA("stormfly-04", STORMFLY04_IPV6),
-  A("stormfly-04.oob", STORMFLY04_OOB),
-  A("rimfaxe", RIMFAXE_IPV4),
-  AAAA("rimfaxe", RIMFAXE_IPV6),
-  A("culebre", CULEBRE_IPV4),
   A("kalessin", KALESSIN_IPV4),
   AAAA("kalessin", KALESSIN_IPV6),
   A("angor", ANGOR_IPV4),
@@ -442,18 +442,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ladon", LADON_IPV4),
   AAAA("ladon", LADON_IPV6),
   A("ascalon", ASCALON_IPV4),
-  A("noomoahk", NOOMOAHK_IPV4),
-  AAAA("noomoahk", NOOMOAHK_IPV6),
   A("cherufe", CHERUFE_IPV4),
-  A("norbert", NORBERT_IPV4),
-  AAAA("norbert", NORBERT_IPV6),
   A("chrysophylax", CHRYSOPHYLAX_IPV4),
   AAAA("chrysophylax", CHRYSOPHYLAX_IPV6),
   A("keizer", KEIZER_IPV4),
   AAAA("keizer", KEIZER_IPV6),
   A("vipertooth", VIPERTOOTH_IPV4),
   AAAA("vipertooth", VIPERTOOTH_IPV6),
-  A("waima", WAIMA_IPV4),
   A("nidhogg", NIDHOGG_IPV4),
   AAAA("nidhogg", NIDHOGG_IPV6),
   A("boitata", BOITATA_IPV4),
@@ -461,29 +456,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("fafnir", FAFNIR_IPV4),
   AAAA("fafnir", FAFNIR_IPV6),
   A("fume", FUME_IPV4),
-  A("balerion", BALERION_IPV4),
-  A("naga", NAGA_IPV4),
-  AAAA("naga", NAGA_IPV6),
   A("takhisis", TAKHISIS_IPV4),
   AAAA("takhisis", TAKHISIS_IPV6),
-  A("gorwen", GORWEN_IPV4),
-  AAAA("gorwen", GORWEN_IPV6),
-  A("glaedr", GLAEDR_IPV4),
-  AAAA("glaedr", GLAEDR_IPV6),
   A("neak", NEAK_IPV4),
   A("meraxes", MERAXES_IPV4),
   AAAA("meraxes", MERAXES_IPV6),
-  A("fuchur", FUCHUR_IPV4),
-  AAAA("fuchur", FUCHUR_IPV6),
-  A("idris", IDRIS_IPV4),
-  AAAA("idris", IDRIS_IPV6),
   A("kokosnuss", KOKOSNUSS_IPV4),
   A("shruikan", SHRUIKAN_IPV4),
   AAAA("shruikan", SHRUIKAN_IPV6),
-  A("falkor", FALKOR_IPV4),
-  AAAA("falkor", FALKOR_IPV6),
-  A("lockheed", LOCKHEED_IPV4),
-  AAAA("lockheed", LOCKHEED_IPV6),
   A("firnen", FIRNEN_IPV4),
 
   // Blades
@@ -534,7 +514,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Uptime site at StatusCake
 
-  CNAME("uptime", "uptimessl.statuscake.com."),
+  CNAME("uptime", "uptimessl-new.statuscake.com."),
 
   // Custom Domain for https://github.com/osmfoundation/welcome-mat/