X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/629b0194771e9f99bc46b537b545adf0c0f258e9..faea8580706fb38306462a30e9644283c6e8ef0b:/src/stateofthemap.js

diff --git a/src/stateofthemap.js b/src/stateofthemap.js
index 47076f5..6924c62 100644
--- a/src/stateofthemap.js
+++ b/src/stateofthemap.js
@@ -2,9 +2,29 @@ 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
+      "-all"
+    ]
+  }),
 
   // Let google handle email
 
@@ -16,23 +36,33 @@ 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("@", "193.60.236.19", TTL("10m")),
-  A("www", "193.60.236.19", TTL("10m")),
-  A("2020", "193.60.236.19", TTL("10m")),
-  A("2019", "193.60.236.19", TTL("10m")),
-  A("2018", "193.60.236.19", TTL("10m")),
-  A("2017", "193.60.236.19", TTL("10m")),
-  A("2016", "193.60.236.19", TTL("10m")),
-  A("2014", "193.60.236.19", TTL("10m")),
-  A("2013", "193.60.236.19", TTL("10m")),
-  A("2011", "193.60.236.19", TTL("10m")),
-  A("2010", "193.60.236.19", TTL("10m")),
-  A("2009", "193.60.236.19", TTL("10m")),
-  A("2008", "193.60.236.19", TTL("10m")),
-  A("2007", "193.60.236.19", TTL("10m"))
+  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")),
+
+  // Google Site Verification - Grant
+  TXT("2022", "google-site-verification=wT1dJzSYM_2By372lJ_v9IU1crF21qOySEAPABxUcyo")
 
 );