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

diff --git a/src/stateofthemap.js b/src/stateofthemap.js
index 1f744ce..b9a4a0f 100644
--- a/src/stateofthemap.js
+++ b/src/stateofthemap.js
@@ -2,9 +2,31 @@ 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
 
@@ -16,19 +38,32 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // 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("2022", NAGA_IPV4, TTL("10m")),
+  AAAA("2022", NAGA_IPV6, TTL("10m")),
+  A("2021", NAGA_IPV4, TTL("10m")),
+  AAAA("2021", NAGA_IPV6, TTL("10m")),
+  A("2020", NAGA_IPV4, TTL("10m")),
+  AAAA("2020", NAGA_IPV6, TTL("10m")),
+  A("2019", NAGA_IPV4, TTL("10m")),
+  AAAA("2019", NAGA_IPV6, TTL("10m")),
+  A("2018", NAGA_IPV4, TTL("10m")),
+  AAAA("2018", NAGA_IPV6, TTL("10m")),
+  A("2017", NAGA_IPV4, TTL("10m")),
+  AAAA("2017", NAGA_IPV6, TTL("10m")),
+  A("2016", NAGA_IPV4, TTL("10m")),
+  AAAA("2016", NAGA_IPV6, TTL("10m")),
+  A("2013", NAGA_IPV4, TTL("10m")),
+  AAAA("2013", NAGA_IPV6, TTL("10m")),
   A("2012", RIDLEY_IPV4, TTL("10m")),
   A("2011", RIDLEY_IPV4, TTL("10m")),
   A("2010", RIDLEY_IPV4, TTL("10m")),
@@ -36,8 +71,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("2008", RIDLEY_IPV4, TTL("10m")),
   A("2007", RIDLEY_IPV4, TTL("10m")),
 
-  // Video conferencing server
-
-  A("talk", "95.217.113.173")
+  // Google Site Verification - Grant
+  TXT("2022", "google-site-verification=wT1dJzSYM_2By372lJ_v9IU1crF21qOySEAPABxUcyo")
 
 );