From: Tom Hughes <tom@compton.nu>
Date: Tue, 21 Jun 2022 15:58:29 +0000 (+0100)
Subject: Merge remote-tracking branch 'github/pull/14'
X-Git-Url: https://git.openstreetmap.org./dns.git/commitdiff_plain/2be0aa31e74d747f8fcf891a4365772dc7a0abb7?hp=-c

Merge remote-tracking branch 'github/pull/14'
---

2be0aa31e74d747f8fcf891a4365772dc7a0abb7
diff --combined src/osmfoundation.js
index 27b9f31,d0df4d4..d4f499f
--- a/src/osmfoundation.js
+++ b/src/osmfoundation.js
@@@ -2,17 -2,9 +2,17 @@@ D(DOMAIN, REGISTRAR, DnsProvider(PROVID
  
    // 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
  
@@@ -28,20 -20,7 +28,20 @@@
  
    // 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"
 +    ]
 +  }),
 +
 +  // Apple Business Manager verification
 +  TXT("@", "apple-domain-verification=ZzBG2msRtUDehTMW"),
  
    // DKIM keys
  
@@@ -54,11 -33,11 +54,11 @@@
  
    // 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
  
@@@ -75,6 -54,6 +75,6 @@@
  
    // Nextcloud instance
  
-   CNAME("files", "osmfiles.cloud68.co.")
 -  CNAME("files", "nextcloud-openstreetmapfoundation.cloud68.systems")
++  CNAME("files", "nextcloud-openstreetmapfoundation.cloud68.systems.")
  
  );