Switch outgoing mail and mta-sts to fafnir

[dns.git] / src / osmfoundation.js

diff --git a/src/osmfoundation.js b/src/osmfoundation.js
index 8be6b56ce0aa915e5893d79308016b66f82b404c..4e3c624365abe8140a9c5924085e18c187ddd99d 100644 (file)
--- a/src/osmfoundation.js
+++ b/src/osmfoundation.js
@@ -4,7 +4,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   CAA_BUILDER({
     label: "@",
 
   CAA_BUILDER({
     label: "@",

-    ttl: "1h",

     iodef: "mailto:hostmaster@openstreetmap.org",
     issue: [
       "letsencrypt.org",
     iodef: "mailto:hostmaster@openstreetmap.org",
     issue: [
       "letsencrypt.org",


@@ -30,19 +29,23 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   SPF_BUILDER({
     label: "@",
 
   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
     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"
     ]
   }),
 
       "-all"
     ]
   }),
 

+  // Apple Business Manager verification
+  TXT("@", "apple-domain-verification=ZzBG2msRtUDehTMW"),
+

   // DKIM keys
 
   // DKIM keys
 

-  TXT("google._domainkey", "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCJmTBAkYRCocCCNtVsdRNMlQel8kNfjPYJpjEm7woEgZh9yZeDzxImtz+u73oUF4+7bXzrNYbP946WNQIwAba1J69he8L1qfPBJLd3Z/fgmuaGdWcxpDno2EY4cQ8PrzvI6Vfm+6YAFANl8w09CIg41ykdlzH4iUJXD35k3SIl3wIDAQAB", TTL("15m")),
+  TXT("google._domainkey", "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCJmTBAkYRCocCCNtVsdRNMlQel8kNfjPYJpjEm7woEgZh9yZeDzxImtz+u73oUF4+7bXzrNYbP946WNQIwAba1J69he8L1qfPBJLd3Z/fgmuaGdWcxpDno2EY4cQ8PrzvI6Vfm+6YAFANl8w09CIg41ykdlzH4iUJXD35k3SIl3wIDAQAB"),

   TXT("20201112._domainkey", "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz4OyJc77mpW5djxVfZm18HcmJHQLpo7B2Z8Og8byICjDiG91Tpkv5ws3xIbMsi/tVA6p5L76uL0TGKlo4ayewYvJUTC22+hBWARUuWA0DgeMwBpW/dNUOJHBABCTouolvXLKRTPTefA177Y5jYbD7ZeJAR4ZnFbZX6spimXCT66AyhqCBSrOCXYXFm3ons5ANkkQBNZ/jMYczYs9T1ijNEbBNTJmLO+whOrYLyGd3iZ9X9iOmuNFBCgXp0tsN//FBsOyTl559/XY25r3GZhiKXMbrZ1IJewqJlG0+hN1y9qwWGgq5YpZPt5YJ1KGjIrcFX59/PhNQX4khPOaD5g7ZQIDAQAB", AUTOSPLIT),
 
   // Google postmaster tools verification
   TXT("20201112._domainkey", "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz4OyJc77mpW5djxVfZm18HcmJHQLpo7B2Z8Og8byICjDiG91Tpkv5ws3xIbMsi/tVA6p5L76uL0TGKlo4ayewYvJUTC22+hBWARUuWA0DgeMwBpW/dNUOJHBABCTouolvXLKRTPTefA177Y5jYbD7ZeJAR4ZnFbZX6spimXCT66AyhqCBSrOCXYXFm3ons5ANkkQBNZ/jMYczYs9T1ijNEbBNTJmLO+whOrYLyGd3iZ9X9iOmuNFBCgXp0tsN//FBsOyTl559/XY25r3GZhiKXMbrZ1IJewqJlG0+hN1y9qwWGgq5YpZPt5YJ1KGjIrcFX59/PhNQX4khPOaD5g7ZQIDAQAB", AUTOSPLIT),
 
   // Google postmaster tools verification


@@ -59,19 +62,21 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
 
   // Main web server and it's aliases
 
 
   // Main web server and it's aliases
 

-  A("@", RIDLEY_IPV4, TTL("10m")),
-  A("www", RIDLEY_IPV4, TTL("10m")),
-  A("wiki", RIDLEY_IPV4, TTL("10m")),
-  A("blog", RIDLEY_IPV4, TTL("10m")),
-  A("crm", RIDLEY_IPV4, TTL("10m")),
-  A("join", RIDLEY_IPV4, TTL("10m")),
-  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("@", RIDLEY_IPV4),
+  A("www", RIDLEY_IPV4),
+  A("wiki", RIDLEY_IPV4),
+  A("blog", RIDLEY_IPV4),
+  A("crm", RIDLEY_IPV4),
+  A("join", RIDLEY_IPV4),
+  A("board", RIDLEY_IPV4),
+  A("dwg", RIDLEY_IPV4),
+  A("mwg", RIDLEY_IPV4),
+  A("operations", RIDLEY_IPV4),

 
   // Nextcloud instance
 
 
   // Nextcloud instance
 

-  CNAME("files", "osmfiles.cloud68.co.")
+  CNAME("files", "nextcloud-openstreetmapfoundation.cloud68.systems."),
+
+  A("hardware", IDRIS_IPV4)

 
 );
 
 );