X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/7d4bd83441eab99be74dc4836b803c5102319437..f29b572e8d9c22cd20e06b500af09cb35b9771c7:/src/osmfoundation.js

diff --git a/src/osmfoundation.js b/src/osmfoundation.js
index 91cf108..8be6b56 100644
--- a/src/osmfoundation.js
+++ b/src/osmfoundation.js
@@ -2,9 +2,17 @@ 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: "@",
+    ttl: "1h",
+    iodef: "mailto:hostmaster@openstreetmap.org",
+    issue: [
+      "letsencrypt.org",
+    ],
+    issuewild: [
+      "letsencrypt.org",
+    ],
+  }),
 
   // Let google handle email
 
@@ -20,7 +28,17 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // SPF policy
 
-  TXT("@", "v=spf1 ip4:212.110.172.32 ip6:2001:41c9:1:400::32 a mx include:_spf.google.com -all"),
+  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
+      "-all"
+    ]
+  }),
 
   // DKIM keys
 
@@ -33,16 +51,15 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Aliases for google services
 
-  CNAME("login", "ghs.google.com."),
-  CNAME("docs", "ghs.google.com."),
-  CNAME("mail", "ghs.google.com."),
-  CNAME("calendar", "ghs.google.com."),
-  CNAME("sites", "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("old", RIDLEY_IPV4, TTL("10m")),
   A("www", RIDLEY_IPV4, TTL("10m")),
   A("wiki", RIDLEY_IPV4, TTL("10m")),
   A("blog", RIDLEY_IPV4, TTL("10m")),
@@ -51,6 +68,10 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("board", RIDLEY_IPV4, TTL("10m")),
   A("dwg", RIDLEY_IPV4, TTL("10m")),
   A("mwg", RIDLEY_IPV4, TTL("10m")),
-  A("operations", RIDLEY_IPV4, TTL("10m"))
+  A("operations", RIDLEY_IPV4, TTL("10m")),
+
+  // Nextcloud instance
+
+  CNAME("files", "osmfiles.cloud68.co.")
 
 );