X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/2e160a4da716bab9a123e6afd174e58f5f9991a3..f2c8d62ad4ac1597fdb2d56b7203744419f5cf8e:/src/stateofthemap.js

diff --git a/src/stateofthemap.js b/src/stateofthemap.js
index 1f744ce..a224ea4 100644
--- a/src/stateofthemap.js
+++ b/src/stateofthemap.js
@@ -2,42 +2,103 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Publish CAA records indicating that only letsencrypt should issue certificates
 
-  CAA("@", "issue", "letsencrypt.org", CF_TTL_ANY),
-  CAA("@", "issuewild", "letsencrypt.org", CF_TTL_ANY),
-  CAA("@", "iodef", "mailto:hostmaster@openstreetmap.org"),
+  CAA_BUILDER({
+    label: "@",
+    iodef: "mailto:hostmaster@openstreetmap.org",
+    issue: [
+      "letsencrypt.org",
+    ],
+    issuewild: [
+      "letsencrypt.org",
+    ],
+  }),
+
+  // SPF policy
+
+  SPF_BUILDER({
+    label: "@",
+    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
 
-  CNAME("login", "ghs.google.com."),
+  CNAME("login", "ghs.googlehosted.com."),
+  CNAME("docs", "ghs.googlehosted.com."),
+  CNAME("mail", "ghs.googlehosted.com."),
+  CNAME("calendar", "ghs.googlehosted.com."),
+  CNAME("sites", "ghs.googlehosted.com."),
 
   // Main web server and it's aliases
 
-  A("@", RIDLEY_IPV4, TTL("10m")),
-  A("www", 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")),
-
-  // Video conferencing server
-
-  A("talk", "95.217.113.173")
+  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")
 
 );