]> git.openstreetmap.org Git - dns.git/blobdiff - src/openstreetmap.js
projects / dns.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add a few initial HTTPS/SVCB DNS records
[dns.git] / src / openstreetmap.js
diff --git a/src/openstreetmap.js b/src/openstreetmap.js
index e3c09183e1f09224814094e5654bb6ffb87af39a..5e0da6063c0c1131d54bab48caf203eddb55ddc5 100644 (file)
--- a/src/openstreetmap.js
+++ b/src/openstreetmap.js
@@ -38,15 +38,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     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
-      "ip4:193.60.236.0/24",          // ucl external
-      "ip4:184.104.179.128/27",       // amsterdam external
-      "ip6:2001:470:1:fa1::/64",      // amsterdam external
-      "ip4:184.104.226.96/27",        // dublin external
-      "ip6:2001:470:1:b3b::/64",      // dublin external
+      "ip4:193.60.236.0/24",      // ucl external
+      "ip4:184.104.179.128/27",   // amsterdam external
+      "ip6:2001:470:1:fa1::/64",  // amsterdam external
+      "ip4:184.104.226.96/27",    // dublin external
+      "ip6:2001:470:1:b3b::/64",  // dublin external
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -56,15 +54,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     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
-      "ip4:193.60.236.0/24",          // ucl external
-      "ip4:184.104.179.128/27",       // amsterdam external
-      "ip6:2001:470:1:fa1::/64",      // amsterdam external
-      "ip4:184.104.226.96/27",        // dublin external
-      "ip6:2001:470:1:b3b::/64",      // dublin external
+      "ip4:193.60.236.0/24",      // ucl external
+      "ip4:184.104.179.128/27",   // amsterdam external
+      "ip6:2001:470:1:fa1::/64",  // amsterdam external
+      "ip4:184.104.226.96/27",    // dublin external
+      "ip6:2001:470:1:b3b::/64",  // dublin external
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -74,15 +70,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     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
-      "ip4:193.60.236.0/24",          // ucl external
-      "ip4:184.104.179.128/27",       // amsterdam external
-      "ip6:2001:470:1:fa1::/64",      // amsterdam external
-      "ip4:184.104.226.96/27",        // dublin external
-      "ip6:2001:470:1:b3b::/64",      // dublin external
+      "ip4:193.60.236.0/24",      // ucl external
+      "ip4:184.104.179.128/27",   // amsterdam external
+      "ip6:2001:470:1:fa1::/64",  // amsterdam external
+      "ip4:184.104.226.96/27",    // dublin external
+      "ip6:2001:470:1:b3b::/64",  // dublin external
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -92,15 +86,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     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
-      "ip4:193.60.236.0/24",          // ucl external
-      "ip4:184.104.179.128/27",       // amsterdam external
-      "ip6:2001:470:1:fa1::/64",      // amsterdam external
-      "ip4:184.104.226.96/27",        // dublin external
-      "ip6:2001:470:1:b3b::/64",      // dublin external
+      "ip4:193.60.236.0/24",      // ucl external
+      "ip4:184.104.179.128/27",   // amsterdam external
+      "ip6:2001:470:1:fa1::/64",  // amsterdam external
+      "ip4:184.104.226.96/27",    // dublin external
+      "ip6:2001:470:1:b3b::/64",  // dublin external
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -110,15 +102,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     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
-      "ip4:193.60.236.0/24",          // ucl external
-      "ip4:184.104.179.128/27",       // amsterdam external
-      "ip6:2001:470:1:fa1::/64",      // amsterdam external
-      "ip4:184.104.226.96/27",        // dublin external
-      "ip6:2001:470:1:b3b::/64",      // dublin external
+      "ip4:193.60.236.0/24",      // ucl external
+      "ip4:184.104.179.128/27",   // amsterdam external
+      "ip6:2001:470:1:fa1::/64",  // amsterdam external
+      "ip4:184.104.226.96/27",    // dublin external
+      "ip6:2001:470:1:b3b::/64",  // dublin external
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -128,15 +118,13 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     label: "supporting",
     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
-      "ip4:193.60.236.0/24",          // ucl external
-      "ip4:184.104.179.128/27",       // amsterdam external
-      "ip6:2001:470:1:fa1::/64",      // amsterdam external
-      "ip4:184.104.226.96/27",        // dublin external
-      "ip6:2001:470:1:b3b::/64",      // dublin external
+      "ip4:193.60.236.0/24",      // ucl external
+      "ip4:184.104.179.128/27",   // amsterdam external
+      "ip6:2001:470:1:fa1::/64",  // amsterdam external
+      "ip4:184.104.226.96/27",    // dublin external
+      "ip6:2001:470:1:b3b::/64",  // dublin external
       "mx",                       // safety net if we change mx
       "-all"
     ]
@@ -274,6 +262,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("spike-08.ams", SPIKE08_INTERNAL),
   A("spike-08.oob", SPIKE08_OOB),
 
+  // HTTPS / SVCB records
+  HTTPS("www", 1, ".", "alpn=h2"),
+  HTTPS("api", 1, ".", "alpn=h2"),
+  HTTPS("maps", 1, ".", "alpn=h2"),
+  HTTPS("mapz", 1, ".", "alpn=h2"),
+
   // Nominatim servers
 
   A("dulcy", DULCY_IPV4),
@@ -308,6 +302,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("dribble.ams", DRIBBLE_INTERNAL),
   A("dribble.oob", DRIBBLE_OOB),
 
+  // HTTPS / SVCB records
+  HTTPS("taginfo", 1, ".", "alpn=h2"),
+
   // Tile servers
 
   A("odin", ODIN_IPV4),
@@ -332,6 +329,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("scorch", SCORCH_IPV6),
 
   A("rhaegal", RHAEGAL_IPV4),
+  AAAA("rhaegal", RHAEGAL_IPV6),
 
   A("palulukon", PALULUKON_IPV4),
 
@@ -367,6 +365,14 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("logstash", IRONBELLY_IPV6),
   A("tiler", IRONBELLY_IPV4),
   AAAA("tiler", IRONBELLY_IPV6),
+  A("us-imagery", IRONBELLY_IPV4),
+  AAAA("us-imagery", IRONBELLY_IPV6),
+  A("a.us-imagery", IRONBELLY_IPV4),
+  AAAA("a.us-imagery", IRONBELLY_IPV6),
+  A("b.us-imagery", IRONBELLY_IPV4),
+  AAAA("b.us-imagery", IRONBELLY_IPV6),
+  A("c.us-imagery", IRONBELLY_IPV4),
+  AAAA("c.us-imagery", IRONBELLY_IPV6),
   A("ironbelly.ams", IRONBELLY_INTERNAL),
   A("ironbelly.oob", IRONBELLY_OOB),
 
@@ -436,12 +442,16 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   // Foundation server
 
   A("ridley", RIDLEY_IPV4),
-  A("otrs", RIDLEY_IPV4),
   A("blog", RIDLEY_IPV4),
   A("foundation", RIDLEY_IPV4),
   A("ridley.ucl", RIDLEY_INTERNAL),
   A("ridley.oob", RIDLEY_OOB),
 
+  A("staging.blog", FUME_IPV4),
+  AAAA("staging.blog", FUME_IPV6),
+  A("birthday20", FUME_IPV4),
+  AAAA("birthday20", FUME_IPV6),
+
   // Matomo server
 
   A("smaug", SMAUG_IPV4),
@@ -455,36 +465,34 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Imagery servers
 
-  A("draco", DRACO_IPV4),
-  A("draco.ucl", DRACO_INTERNAL),
-  A("draco.oob", DRACO_OOB),
-
   A("kessie", KESSIE_IPV4),
   AAAA("kessie", KESSIE_IPV6),
-  A("agri", KESSIE_IPV4, TTL("1h")),
-  AAAA("agri", KESSIE_IPV6, TTL("1h")),
-  A("a.agri", KESSIE_IPV4, TTL("1h")),
-  AAAA("a.agri", KESSIE_IPV6, TTL("1h")),
-  A("b.agri", KESSIE_IPV4, TTL("1h")),
-  AAAA("b.agri", KESSIE_IPV6, TTL("1h")),
-  A("c.agri", KESSIE_IPV4, TTL("1h")),
-  AAAA("c.agri", KESSIE_IPV6, TTL("1h")),
-  A("os", KESSIE_IPV4, TTL("1h")),
-  AAAA("os", KESSIE_IPV6, TTL("1h")),
-  A("a.os", KESSIE_IPV4, TTL("1h")),
-  AAAA("a.os", KESSIE_IPV6, TTL("1h")),
-  A("b.os", KESSIE_IPV4, TTL("1h")),
-  AAAA("b.os", KESSIE_IPV6, TTL("1h")),
-  A("c.os", KESSIE_IPV4, TTL("1h")),
-  AAAA("c.os", KESSIE_IPV6, TTL("1h")),
+  A("agri", KESSIE_IPV4),
+  AAAA("agri", KESSIE_IPV6),
+  A("a.agri", KESSIE_IPV4),
+  AAAA("a.agri", KESSIE_IPV6),
+  A("b.agri", KESSIE_IPV4),
+  AAAA("b.agri", KESSIE_IPV6),
+  A("c.agri", KESSIE_IPV4),
+  AAAA("c.agri", KESSIE_IPV6),
+  A("os", KESSIE_IPV4),
+  AAAA("os", KESSIE_IPV6),
+  A("a.os", KESSIE_IPV4),
+  AAAA("a.os", KESSIE_IPV6),
+  A("b.os", KESSIE_IPV4),
+  AAAA("b.os", KESSIE_IPV6),
+  A("c.os", KESSIE_IPV4),
+  AAAA("c.os", KESSIE_IPV6),
   A("kessie.oob", KESSIE_OOB),
 
-  // Prometheus server
+  // Prometheus server and munin redirect
 
   A("stormfly-03", STORMFLY03_IPV4),
   AAAA("stormfly-03", STORMFLY03_IPV6),
   A("prometheus", STORMFLY03_IPV4),
   AAAA("prometheus", STORMFLY03_IPV6),
+  A("munin", STORMFLY03_IPV4),
+  AAAA("munin", STORMFLY03_IPV6),
   A("stormfly-03.oob", STORMFLY03_OOB),
 
   // Management server
@@ -551,8 +559,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("irc", NAGA_IPV6),
   A("blogs", NAGA_IPV4),
   AAAA("blogs", NAGA_IPV6),
-  A("munin", NAGA_IPV4),
-  AAAA("munin", NAGA_IPV6),
   A("welcome", NAGA_IPV4),
   AAAA("welcome", NAGA_IPV6),
   A("operations", NAGA_IPV4),
@@ -561,6 +567,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   AAAA("hot", NAGA_IPV6),
   A("dmca", NAGA_IPV4),
   AAAA("dmca", NAGA_IPV6),
+  A("otrs", NAGA_IPV4),
+  AAAA("otrs", NAGA_IPV6),
+
   A("naga.dub", NAGA_INTERNAL),
   A("naga.oob", NAGA_OOB),
 
@@ -575,12 +584,12 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Overpass server
 
-  A("gorwen", GORWEN_IPV4),
-  AAAA("gorwen", GORWEN_IPV6),
-  A("query", GORWEN_IPV4),
-  AAAA("query", GORWEN_IPV6),
-  A("gorwen.dub", GORWEN_INTERNAL),
-  A("gorwen.oob", GORWEN_OOB),
+  A("grisu", GRISU_IPV4),
+  AAAA("grisu", GRISU_IPV6),
+  A("query", GRISU_IPV4),
+  AAAA("query", GRISU_IPV6),
+  A("grisu.dub", GRISU_INTERNAL),
+  A("grisu.oob", GRISU_OOB),
 
   // GPS tile server
 
@@ -622,16 +631,28 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   A("jakelong", JAKELONG_IPV4),
   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),
+
+  // HTTPS / SVCB records
+  HTTPS("community", 1, ".", "alpn=h2"),
+  HTTPS("communities", 1, ".", "alpn=h2"),
+  HTTPS("c", 1, ".", "alpn=h2"),
+
   CNAME("community-cdn", "dualstack.n.sni.global.fastly.net."),
   TXT("community", "google-site-verification=hQ8GZyj4KwnPqAX2oAzpbLrh6I5dfR08PSdL3icVkfg"),
+
   A("forum", JAKELONG_IPV4),
   AAAA("forum", JAKELONG_IPV6),
+
+  // HTTPS / SVCB records
+  HTTPS("forum", 1, ".", "alpn=h2"),
+
   A("jakelong.dub", JAKELONG_INTERNAL),
   A("jakelong.oob", JAKELONG_OOB),
 
@@ -641,6 +662,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("support", RIDLEY_IPV4),
   A("supporting", RIDLEY_IPV4),
 
+  // HTTPS / SVCB records
+  HTTPS("donate", 1, ".", "alpn=h2"),
+  HTTPS("support", 1, ".", "alpn=h2"),
+  HTTPS("supporting", 1, ".", "alpn=h2"),
+
   // Spare servers
 
   A("fume", FUME_IPV4),
@@ -648,11 +674,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("fume.dub", FUME_INTERNAL),
   A("fume.oob", FUME_OOB),
 
-  A("grisu", GRISU_IPV4),
-  AAAA("grisu", GRISU_IPV6),
-  A("grisu.dub", GRISU_INTERNAL),
-  A("grisu.oob", GRISU_OOB),
-
   // Uptime site at StatusCake
 
   CNAME("uptime", "uptimessl-new.statuscake.com."),
OpenStreetMap DNS