]> git.openstreetmap.org Git - dns.git/blobdiff - src/openstreetmap.js
Point acme.openstreetmap.org at idris
[dns.git] / src / openstreetmap.js
index 38c8c05c8678b5cf28f7775083596945a06b2f10..083353a588493d011420e97d4fcb7fb88b239b17 100644 (file)
@@ -2,11 +2,19 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Publish CAA records indicating that only letsencrypt and globalsign (Fastly) should issue certificates
 
-  CAA("@", "issue", "letsencrypt.org", CF_TTL_ANY),
-  CAA("@", "issuewild", "letsencrypt.org", CF_TTL_ANY),
-  CAA("@", "issue", "globalsign.com", CF_TTL_ANY),
-  CAA("@", "issuewild", "globalsign.com", CF_TTL_ANY),
-  CAA("@", "iodef", "mailto:hostmaster@openstreetmap.org"),
+  CAA_BUILDER({
+    label: "@",
+    ttl: "1h",
+    iodef: "mailto:hostmaster@openstreetmap.org",
+    issue: [
+      "letsencrypt.org",
+      "globalsign.com",   // Used by Fastly for CDN certificates
+    ],
+    issuewild: [
+      "letsencrypt.org",
+      "globalsign.com",   // Used by Fastly for CDN certificates
+    ],
+  }),
 
   // Use shenron as the MX host
 
@@ -14,23 +22,96 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   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),
 
   // Publish SPF records indicating that only shenron sends mail
 
-  TXT("@", "v=spf1 ip4:212.110.172.32 ip6:2001:41c9:1:400::32 mx -all"),
-  TXT("otrs", "v=spf1 ip4:212.110.172.32 ip6:2001:41c9:1:400::32 mx -all"),
+  SPF_BUILDER({
+    label: "@",
+    parts: [
+      "v=spf1",
+      "ip4:212.110.172.32",       // shenron ipv4
+      "ip6:2001:41c9:1:400::32",  // shenron ipv6
+      "ip4:184.104.226.98",       // fafnir ipv4
+      "ip6:2001:470:1:b3b::2",    // fafnir ipv6
+      "mx",                       // safety net if we change mx
+      "-all"
+    ]
+  }),
+
+  SPF_BUILDER({
+    label: "messages",
+    parts: [
+      "v=spf1",
+      "ip4:212.110.172.32",       // shenron ipv4
+      "ip6:2001:41c9:1:400::32",  // shenron ipv6
+      "ip4:184.104.226.98",       // fafnir ipv4
+      "ip6:2001:470:1:b3b::2",    // fafnir ipv6
+      "mx",                       // safety net if we change mx
+      "-all"
+    ]
+  }),
+
+  SPF_BUILDER({
+    label: "noreply",
+    parts: [
+      "v=spf1",
+      "ip4:212.110.172.32",       // shenron ipv4
+      "ip6:2001:41c9:1:400::32",  // shenron ipv6
+      "ip4:184.104.226.98",       // fafnir ipv4
+      "ip6:2001:470:1:b3b::2",    // fafnir ipv6
+      "mx",                       // safety net if we change mx
+      "-all"
+    ]
+  }),
+
+  SPF_BUILDER({
+    label: "otrs",
+    parts: [
+      "v=spf1",
+      "ip4:212.110.172.32",       // shenron ipv4
+      "ip6:2001:41c9:1:400::32",  // shenron ipv6
+      "ip4:184.104.226.98",       // fafnir ipv4
+      "ip6:2001:470:1:b3b::2",    // fafnir ipv6
+      "mx",                       // safety net if we change mx
+      "-all"
+    ]
+  }),
+
+  SPF_BUILDER({
+    label: "community",
+    parts: [
+      "v=spf1",
+      "ip4:212.110.172.32",       // shenron ipv4
+      "ip6:2001:41c9:1:400::32",  // shenron ipv6
+      "ip4:184.104.226.98",       // fafnir ipv4
+      "ip6:2001:470:1:b3b::2",    // fafnir ipv6
+      "mx",                       // safety net if we change mx
+      "-all"
+    ]
+  }),
 
   // Publish DKIM public key
 
   TXT("20200301._domainkey", "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzvoNZVOGfw1V4A171hxHMhzVTAnIUQVJ8iX3wbqCld8A5iIaXeTGYvBmewymax/cYJS4QqzbpUzkgrrTA9avuZhd+QGJDgjADgx4VyMOaOS6FwAxS0uXtLrt+lsixRDx/feKyZHaxjzJAQy46ok77xXL4UXIaaovw6G6eZpIScMzZQ2zkKNJxTICzzSOduIilHhMWte4XP+/2PdRmD7Ge9jb0U4bZjswX0AqKSGzDKYw+yxVna9l53adeCnklqg2ofoXu+ResiH+kt05aCUOMo8en3em6yBnRCMalgi1E3Tt7I5BWcYFRkT/8agUGW4gGC6XMV9IskOsYL0emG0kGwIDAQAB", AUTOSPLIT),
 
+  // Publish DMARC report-only policy
+
+  DMARC_BUILDER({
+    policy: "none",
+    rua: [
+      "mailto:openstreetmap-d@dmarc.report-uri.com"
+    ],
+    failureOptions: 1
+  }),
+
   // Announce MTA-STS policy and TLSRPT policy for error reports
 
   TXT("_mta-sts", "v=STSv1; id=202001291805Z"),
-  TXT("_smtp._tls", "v=TLSRPTv1; rua=mailto:postmaster@openstreetmap.org"),
-  
+  TXT("_smtp._tls", "v=TLSRPTv1; rua=mailto:openstreetmap-d@tlsrpt.report-uri.com"),
+
   // Fastly cert domain ownership confirmation
 
   TXT("@", "_globalsign-domain-verification=ps00GlW1BzY9c2_cwH_pFqRkvzZyaCVZ-3RLssRG6S"),
@@ -41,22 +122,60 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   CNAME("_mta-sts.messages", QUALIFY("_mta-sts")),
   CNAME("_mta-sts.noreply", QUALIFY("_mta-sts")),
   CNAME("_mta-sts.otrs", QUALIFY("_mta-sts")),
+  CNAME("_mta-sts.community", QUALIFY("_mta-sts")),
 
   // Google postmaster tools verification
 
   CNAME("af323lytato5", "gv-o4v3qh5pfayqex.dv.googlehosted.com."),
   CNAME("irzdddnmh465", "gv-cwr6bvt7xsgact.dv.googlehosted.com."),
 
-  // Delegate geo.openstreetmap.org to PowerDNS
-
-  NS("geo", QUALIFY("balerion")),
-  NS("geo", QUALIFY("chrysophylax")),
-  NS("geo", QUALIFY("saphira")),
-  NS("geo", QUALIFY("stormfly-04")),
-  NS("geo", QUALIFY("ridgeback")),
-
   // Main web servers and their aliases
 
+  A("spike-01", SPIKE01_IPV4),
+  AAAA("spike-01", SPIKE01_IPV6),
+  // A("@", SPIKE01_IPV4, TTL("10m")),
+  // AAAA("@", SPIKE01_IPV6, TTL("10m")),
+  // A("www", SPIKE01_IPV4, TTL("10m")),
+  // AAAA("www", SPIKE01_IPV6, TTL("10m")),
+  // A("api", SPIKE01_IPV4, TTL("10m")),
+  // AAAA("api", SPIKE01_IPV6, TTL("10m")),
+  // A("maps", SPIKE01_IPV4, TTL("10m")),
+  // AAAA("maps", SPIKE01_IPV6, TTL("10m")),
+  // A("mapz", SPIKE01_IPV4, TTL("10m")),
+  // AAAA("mapz", SPIKE01_IPV6, TTL("10m")),
+  A("spike-01.dub", SPIKE01_INTERNAL),
+  A("spike-01.oob", SPIKE01_OOB),
+
+  A("spike-02", SPIKE02_IPV4),
+  AAAA("spike-02", SPIKE02_IPV6),
+  // A("@", SPIKE02_IPV4, TTL("10m")),
+  // AAAA("@", SPIKE02_IPV6, TTL("10m")),
+  // A("www", SPIKE02_IPV4, TTL("10m")),
+  // AAAA("www", SPIKE02_IPV6, TTL("10m")),
+  // A("api", SPIKE02_IPV4, TTL("10m")),
+  // AAAA("api", SPIKE02_IPV6, TTL("10m")),
+  // A("maps", SPIKE02_IPV4, TTL("10m")),
+  // AAAA("maps", SPIKE02_IPV6, TTL("10m")),
+  // A("mapz", SPIKE02_IPV4, TTL("10m")),
+  // AAAA("mapz", SPIKE02_IPV6, TTL("10m")),
+  A("spike-02.dub", SPIKE02_INTERNAL),
+  A("spike-02.oob", SPIKE02_OOB),
+
+  A("spike-03", SPIKE03_IPV4),
+  AAAA("spike-03", SPIKE03_IPV6),
+  // A("@", SPIKE03_IPV4, TTL("10m")),
+  // AAAA("@", SPIKE03_IPV6, TTL("10m")),
+  // A("www", SPIKE03_IPV4, TTL("10m")),
+  // AAAA("www", SPIKE03_IPV6, TTL("10m")),
+  // A("api", SPIKE03_IPV4, TTL("10m")),
+  // AAAA("api", SPIKE03_IPV6, TTL("10m")),
+  // A("maps", SPIKE03_IPV4, TTL("10m")),
+  // AAAA("maps", SPIKE03_IPV6, TTL("10m")),
+  // A("mapz", SPIKE03_IPV4, TTL("10m")),
+  // AAAA("mapz", SPIKE03_IPV6, TTL("10m")),
+  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, TTL("10m")),
@@ -134,10 +253,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),
@@ -146,14 +261,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("rails3.ams", THORN03_INTERNAL),
   A("thorn-03.oob", THORN03_OOB),
 
-  A("thorn-04.bm", THORN04_INTERNAL),
-  A("rails4.bm", THORN04_INTERNAL),
-  A("thorn-04.oob", THORN04_OOB),
-
-  A("thorn-05.bm", THORN05_INTERNAL),
-  A("rails5.bm", THORN05_INTERNAL),
-  A("thorn-05.oob", THORN05_OOB),
-
   // Nominatim servers
 
   A("pummelzacken", PUMMELZACKEN_IPV4),
@@ -165,7 +272,18 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("dulcy.ams", DULCY_INTERNAL),
   A("dulcy.oob", DULCY_OOB),
 
+  A("longma", LONGMA_IPV4),
+  AAAA("longma", LONGMA_IPV6),
+  A("longma.dub", LONGMA_INTERNAL),
+  A("longma.oob", LONGMA_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."),
+  CNAME("qa-tile.nominatim", "longma.openstreetmap.org."),
 
   // Taginfo server
 
@@ -176,11 +294,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Tile servers
 
-  A("orm", ORM_IPV4),
-  AAAA("orm", ORM_IPV6),
-  A("orm.ams", ORM_INTERNAL),
-  A("orm.oob", ORM_OOB),
-
   A("odin", ODIN_IPV4),
   AAAA("odin", ODIN_IPV6),
   A("odin.ams", ODIN_INTERNAL),
@@ -190,6 +303,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ysera.ucl", YSERA_INTERNAL),
   A("ysera.oob", YSERA_OOB),
 
+  A("culebre", CULEBRE_IPV4),
+  AAAA("culebre", CULEBRE_IPV6),
+  A("culebre.dub", CULEBRE_INTERNAL),
+  A("culebre.oob", CULEBRE_OOB),
+
+  A("nidhogg", NIDHOGG_IPV4),
+  AAAA("nidhogg", NIDHOGG_IPV6),
+  A("nidhogg.oob", NIDHOGG_OOB),
+
   A("scorch", SCORCH_IPV4),
   AAAA("scorch", SCORCH_IPV6),
 
@@ -209,11 +331,16 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("necrosan", NECROSAN_IPV4),
   AAAA("necrosan", NECROSAN_IPV6),
 
-  CNAME("tile", "dualstack.osff2.map.fastly.net.", TTL("10m")),
-  CNAME("a.tile", "dualstack.osff2.map.fastly.net.", TTL("10m")),
-  CNAME("b.tile", "dualstack.osff2.map.fastly.net.", TTL("10m")),
-  CNAME("c.tile", "dualstack.osff2.map.fastly.net.", TTL("10m")),
-  
+  CNAME("tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
+  CNAME("a.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
+  CNAME("b.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
+  CNAME("c.tile", "dualstack.n.sni.global.fastly.net.", TTL("10m")),
+
+  A("render", CULEBRE_IPV4),
+  A("render", NIDHOGG_IPV4),
+  AAAA("render", CULEBRE_IPV6),
+  AAAA("render", NIDHOGG_IPV6),
+
   // Services machine
 
   A("ironbelly", IRONBELLY_IPV4),
@@ -227,6 +354,33 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ironbelly.ams", IRONBELLY_INTERNAL),
   A("ironbelly.oob", IRONBELLY_OOB),
 
+  A("norbert", NORBERT_IPV4),
+  AAAA("norbert", NORBERT_IPV6),
+  // A("backup", NORBERT_IPV4, TTL("10m")),
+  // AAAA("backup", NORBERT_IPV6, TTL("10m")),
+  // A("planet", NORBERT_IPV4, TTL("10m")),
+  // AAAA("planet", NORBERT_IPV6, TTL("10m")),
+  A("norbert.ams", NORBERT_INTERNAL),
+  A("norbert.oob", NORBERT_OOB),
+
+  A("fafnir", FAFNIR_IPV4),
+  AAAA("fafnir", FAFNIR_IPV6),
+  // A("backup", FAFNIR_IPV4, TTL("10m")),
+  // AAAA("backup", FAFNIR_IPV6, TTL("10m")),
+  // A("planet", FAFNIR_IPV4, TTL("10m")),
+  // AAAA("planet", FAFNIR_IPV6, TTL("10m")),
+  A("fafnir.dub", FAFNIR_INTERNAL),
+  A("fafnir.oob", FAFNIR_OOB),
+
+  A("horntail", HORNTAIL_IPV4),
+  AAAA("horntail", HORNTAIL_IPV6),
+  // A("backup", HORNTAIL_IPV4, TTL("10m")),
+  // AAAA("backup", HORNTAIL_IPV6, TTL("10m")),
+  // A("planet", HORNTAIL_IPV4, TTL("10m")),
+  // AAAA("planet", HORNTAIL_IPV6, TTL("10m")),
+  A("horntail.dub", HORNTAIL_INTERNAL),
+  A("horntail.oob", HORNTAIL_OOB),
+
   A("grisu", GRISU_IPV4),
   AAAA("grisu", GRISU_IPV6),
   // A("backup", GRISU_IPV4, TTL("10m")),
@@ -244,6 +398,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("snap-02.ucl", SNAP02_INTERNAL),
   A("snap-02.oob", SNAP02_OOB),
 
+  A("snap-03.dub", SNAP03_INTERNAL),
+  A("snap-03.oob", SNAP03_OOB),
+
   A("karm.ams", KARM_INTERNAL),
   A("karm.oob", KARM_OOB),
 
@@ -253,9 +410,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("katla.bm", KATLA_INTERNAL),
   A("katla.oob", KATLA_OOB),
 
-  A("ramoth.ams", RAMOTH_INTERNAL),
-  A("ramoth.oob", RAMOTH_OOB),
-
   // Development server with wildcard alias for user sites
 
   A("errol", ERROL_IPV4),
@@ -269,6 +423,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("errol.ucl", ERROL_INTERNAL),
   A("errol.oob", ERROL_OOB),
 
+  A("faffy", FAFFY_IPV4),
+  AAAA("faffy", FAFFY_IPV6),
+  A("faffy.ams", FAFFY_INTERNAL),
+  A("faffy.oob", FAFFY_OOB),
+
   // Foundation server
 
   A("ridley", RIDLEY_IPV4),
@@ -280,9 +439,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ridley.ucl", RIDLEY_INTERNAL),
   A("ridley.oob", RIDLEY_OOB),
 
-  // Piwik server
+  // Matomo server
 
   A("eustace", EUSTACE_IPV4),
+  A("matomo", EUSTACE_IPV4),
   A("piwik", EUSTACE_IPV4),
   A("eustace.ucl", EUSTACE_INTERNAL),
   A("eustace.oob", EUSTACE_OOB),
@@ -322,19 +482,30 @@ 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
+  // Management server
 
   A("sarel", SAREL_IPV4),
   A("chef", SAREL_IPV4),
-  A("hardware", SAREL_IPV4),
-  A("acme", SAREL_IPV4),
   A("git", SAREL_IPV4, TTL("10m")),
   A("dns", SAREL_IPV4, TTL("10m")),
   A("sarel.ucl", SAREL_INTERNAL),
   A("sarel.oob", SAREL_OOB),
 
+  A("idris", IDRIS_IPV4),
+  AAAA("idris", IDRIS_IPV6),
+  A("acme", IDRIS_IPV4),
+  AAAA("acme", IDRIS_IPV6),
+  A("hardware", IDRIS_IPV4),
+  AAAA("hardware", IDRIS_IPV6),
+  A("idris.dub", IDRIS_INTERNAL),
+  A("idris.oob", IDRIS_OOB),
+
   // Forum server
 
   A("clifford", CLIFFORD_IPV4),
@@ -348,13 +519,25 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Managed network switches
 
-  A("switch1", SWITCH1_IPV4),
-  AAAA("switch1", SWITCH1_IPV6),
+  A("switch1.ams", SWITCH1AMS_IPV4),
+  AAAA("switch1.ams", SWITCH1AMS_IPV6),
+
+  A("switch1.dub", SWITCH1DUB_IPV4),
+  AAAA("switch1.dub", SWITCH1DUB_IPV6),
 
   // Managed power strips
 
-  A("pdu1.ams", PDU1_INTERNAL),
-  A("pdu2.ams", PDU2_INTERNAL),
+  A("pdu1.ams", PDU1AMS_INTERNAL),
+  A("pdu2.ams", PDU2AMS_INTERNAL),
+
+  A("pdu1.dub", PDU1DUB_INTERNAL),
+  A("pdu2.dub", PDU2DUB_INTERNAL),
+
+  // Out of band access servers
+
+  A("oob1.ams", OOB1AMS_INTERNAL),
+
+  A("oob1.dub", OOB1DUB_INTERNAL),
 
   // Bytemark machine, and the services which operate from it
 
@@ -366,18 +549,25 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("mta-sts", SHENRON_IPV6),
   A("lists", SHENRON_IPV4),
   AAAA("lists", SHENRON_IPV6),
-  A("svn", SHENRON_IPV4),
-  AAAA("svn", SHENRON_IPV6),
-  A("trac", SHENRON_IPV4),
-  AAAA("trac", SHENRON_IPV6),
-  A("irc", SHENRON_IPV4),
-  AAAA("irc", SHENRON_IPV6),
   A("help", SHENRON_IPV4),
   AAAA("help", SHENRON_IPV6),
-  A("blogs", SHENRON_IPV4, TTL("10m")),
-  AAAA("blogs", SHENRON_IPV6, TTL("10m")),
   A("shenron.bm", SHENRON_INTERNAL),
 
+  // 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),
+
   // Wiki servers
 
   A("tabaluga", TABALUGA_IPV4),
@@ -387,6 +577,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("tabaluga.ams", TABALUGA_INTERNAL),
   A("tabaluga.oob", TABALUGA_OOB),
 
+  // Overpass server
+
+  A("gorwen", GORWEN_IPV4),
+  AAAA("gorwen", GORWEN_IPV6),
+  A("query", GORWEN_IPV4, TTL("10m")),
+  AAAA("query", GORWEN_IPV6, TTL("10m")),
+  A("gorwen.dub", GORWEN_INTERNAL),
+  A("gorwen.oob", GORWEN_OOB),
+
   // GPS tile server
 
   A("noquiklos", NOQUIKLOS_IPV4),
@@ -411,8 +610,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("ridgeback.oob", RIDGEBACK_OOB),
   A("nepomuk", NEPOMUK_IPV4),
   AAAA("nepomuk", NEPOMUK_IPV6),
-  A("longma", LONGMA_IPV4),
-  AAAA("longma", LONGMA_IPV6),
   A("viserion", VISERION_IPV4),
   AAAA("viserion", VISERION_IPV6),
   A("drogon", DROGON_IPV4),
@@ -421,51 +618,16 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("saphira", SAPHIRA_IPV6),
   A("toothless", TOOTHLESS_IPV4),
   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("culebre", CULEBRE_IPV4),
-  A("kalessin", KALESSIN_IPV4),
-  AAAA("kalessin", KALESSIN_IPV6),
   A("angor", ANGOR_IPV4),
   // AAAA("angor", ANGOR_IPV6),
   A("ladon", LADON_IPV4),
   AAAA("ladon", LADON_IPV6),
   A("ascalon", ASCALON_IPV4),
-  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),
-  AAAA("boitata", BOITATA_IPV6),
-  A("fafnir", FAFNIR_IPV4),
-  AAAA("fafnir", FAFNIR_IPV6),
-  A("fume", FUME_IPV4),
-  A("naga", NAGA_IPV4),
-  AAAA("naga", NAGA_IPV6),
   A("takhisis", TAKHISIS_IPV4),
   AAAA("takhisis", TAKHISIS_IPV6),
   A("neak", NEAK_IPV4),
   A("meraxes", MERAXES_IPV4),
   AAAA("meraxes", MERAXES_IPV6),
-  A("kokosnuss", KOKOSNUSS_IPV4),
-  A("shruikan", SHRUIKAN_IPV4),
-  AAAA("shruikan", SHRUIKAN_IPV6),
   A("firnen", FIRNEN_IPV4),
 
   // Blades
@@ -509,14 +671,32 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Spare
 
+  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),
+
+  // Discourse server ("community")
+  A("jakelong", JAKELONG_IPV4),
+  AAAA("jakelong", JAKELONG_IPV6),
+  A("community", JAKELONG_IPV4),
+  A("communities", JAKELONG_IPV4),
+  AAAA("community", JAKELONG_IPV6),
+  AAAA("communities", JAKELONG_IPV6),
+  A("jakelong.dub", JAKELONG_INTERNAL),
+  A("jakelong.oob", JAKELONG_OOB),
 
   // Donation site
 
-  A("donate", RIDLEY_IPV4, TTL("10m")),
+  A("donate", RIDLEY_IPV4),
 
   // Uptime site at StatusCake
 
-  CNAME("uptime", "uptimessl.statuscake.com."),
+  CNAME("uptime", "uptimessl-new.statuscake.com."),
 
   // Custom Domain for https://github.com/osmfoundation/welcome-mat/