X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/b4b816fe66ee61ed5e9622359f2cb9762afa0162..24545f7911d843008a88acdec3b36e1937554f56:/src/stateofthemap.js

diff --git a/src/stateofthemap.js b/src/stateofthemap.js
index 310fae9..a224ea4 100644
--- a/src/stateofthemap.js
+++ b/src/stateofthemap.js
@@ -4,7 +4,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   CAA_BUILDER({
     label: "@",
-    ttl: "1h",
     iodef: "mailto:hostmaster@openstreetmap.org",
     issue: [
       "letsencrypt.org",
@@ -18,23 +17,24 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   SPF_BUILDER({
     label: "@",
-    ttl: "1h",
     parts: [
       "v=spf1",
       "include:_spf.google.com",  // Google GSuite
       "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
       "-all"
     ]
   }),
 
   // Let google handle email
 
-  MX("@", 1, "aspmx.l.google.com.", TTL("1h")),
-  MX("@", 5, "alt1.aspmx.l.google.com.", TTL("1h")),
-  MX("@", 5, "alt2.aspmx.l.google.com.", TTL("1h")),
-  MX("@", 10, "alt3.aspmx.l.google.com.", TTL("1h")),
-  MX("@", 10, "alt4.aspmx.l.google.com.", TTL("1h")),
+  MX("@", 1, "aspmx.l.google.com."),
+  MX("@", 5, "alt1.aspmx.l.google.com."),
+  MX("@", 5, "alt2.aspmx.l.google.com."),
+  MX("@", 10, "alt3.aspmx.l.google.com."),
+  MX("@", 10, "alt4.aspmx.l.google.com."),
 
   // Aliases for google services
 
@@ -46,22 +46,59 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Main web server and it's aliases
 
-  A("@", RIDLEY_IPV4, TTL("10m")),
-  A("www", RIDLEY_IPV4, TTL("10m")),
-  A("2022", RIDLEY_IPV4, TTL("10m")),
-  A("2021", RIDLEY_IPV4, TTL("10m")),
-  A("2020", RIDLEY_IPV4, TTL("10m")),
-  A("2019", RIDLEY_IPV4, TTL("10m")),
-  A("2018", RIDLEY_IPV4, TTL("10m")),
-  A("2017", RIDLEY_IPV4, TTL("10m")),
-  A("2016", RIDLEY_IPV4, TTL("10m")),
-  A("2014", RIDLEY_IPV4, TTL("10m")),
-  A("2013", RIDLEY_IPV4, TTL("10m")),
-  A("2012", RIDLEY_IPV4, TTL("10m")),
-  A("2011", RIDLEY_IPV4, TTL("10m")),
-  A("2010", RIDLEY_IPV4, TTL("10m")),
-  A("2009", RIDLEY_IPV4, TTL("10m")),
-  A("2008", RIDLEY_IPV4, TTL("10m")),
-  A("2007", RIDLEY_IPV4, TTL("10m"))
+  A("@", NAGA_IPV4),
+  AAAA("@", NAGA_IPV6),
+  A("www", NAGA_IPV4),
+  AAAA("www", NAGA_IPV6),
+  A("2024", NAGA_IPV4),
+  AAAA("2024", NAGA_IPV6),
+  A("2022", NAGA_IPV4),
+  AAAA("2022", NAGA_IPV6),
+  A("2021", NAGA_IPV4),
+  AAAA("2021", NAGA_IPV6),
+  A("2020", NAGA_IPV4),
+  AAAA("2020", NAGA_IPV6),
+  A("2019", NAGA_IPV4),
+  AAAA("2019", NAGA_IPV6),
+  A("2018", NAGA_IPV4),
+  AAAA("2018", NAGA_IPV6),
+  A("2017", NAGA_IPV4),
+  AAAA("2017", NAGA_IPV6),
+  A("2016", NAGA_IPV4),
+  AAAA("2016", NAGA_IPV6),
+  A("2013", NAGA_IPV4),
+  AAAA("2013", NAGA_IPV6),
+  A("2012", RIDLEY_IPV4),
+  A("2011", RIDLEY_IPV4),
+  A("2010", RIDLEY_IPV4),
+  A("2009", NAGA_IPV4),
+  AAAA("2009", NAGA_IPV6),
+  A("2008", NAGA_IPV4),
+  AAAA("2008", NAGA_IPV6),
+  A("2007", NAGA_IPV4),
+  AAAA("2007", NAGA_IPV6),
+
+  // HTTPS / SVCB records
+  HTTPS("@", 1, ".", "alpn=h2"),
+  HTTPS("www", 1, ".", "alpn=h2"),
+  HTTPS("2024", 1, ".", "alpn=h2"),
+  HTTPS("2022", 1, ".", "alpn=h2"),
+  HTTPS("2021", 1, ".", "alpn=h2"),
+  HTTPS("2020", 1, ".", "alpn=h2"),
+  HTTPS("2019", 1, ".", "alpn=h2"),
+  HTTPS("2018", 1, ".", "alpn=h2"),
+  HTTPS("2017", 1, ".", "alpn=h2"),
+  HTTPS("2016", 1, ".", "alpn=h2"),
+  HTTPS("2013", 1, ".", "alpn=h2"),
+  HTTPS("2012", 1, ".", "alpn=h2"),
+  HTTPS("2011", 1, ".", "alpn=h2"),
+  HTTPS("2010", 1, ".", "alpn=h2"),
+  HTTPS("2009", 1, ".", "alpn=h2"),
+  HTTPS("2008", 1, ".", "alpn=h2"),
+  HTTPS("2007", 1, ".", "alpn=h2"),
+
+  // Google Site Verification - Grant
+  TXT("2022", "google-site-verification=wT1dJzSYM_2By372lJ_v9IU1crF21qOySEAPABxUcyo"),
+  TXT("@", "google-site-verification=pqJHZHtrC4UhevQdPlR_2gVDPml6UCwmyHq75bfWLRQ")
 
 );