Remove shenron from SPF records

[dns.git] / src / osmfoundation.js

diff --git a/src/osmfoundation.js b/src/osmfoundation.js
index 7d83d66f182832939c886d4e9d0953bf510dc0a6..f36b23a497397ef01a50140ee772ec6e9c78b26d 100644 (file)
--- a/src/osmfoundation.js
+++ b/src/osmfoundation.js
@@ -13,13 +13,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     ],
   }),
 
     ],
   }),
 

-  // Let google handle email
+  // Let mailbox.org handle email

 
 

-  MX("@", 1, "aspmx.l.google.com."),
-  MX("@", 5, "alt1.aspmx.l.google.com."),
-  MX("@", 5, "alt2.aspmx.l.google.com."),
-  MX("@", 10, "alt3.aspmx.l.google.com."),
-  MX("@", 10, "alt4.aspmx.l.google.com."),
+  MX("@", 10, "mxext1.mailbox.org."),
+  MX("@", 10, "mxext2.mailbox.org."),
+  MX("@", 20, "mxext3.mailbox.org."),

 
   // Handle mail for the join subdomain ourselves
 
 
   // Handle mail for the join subdomain ourselves
 


@@ -31,6 +29,7 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
     label: "@",
     parts: [
       "v=spf1",
     label: "@",
     parts: [
       "v=spf1",

+      "include:mailbox.org",     // mailbox.org

       "include:_spf.google.com", // Google GSuite
       "ip4:212.110.172.32",      // shenron ipv4
       "ip6:2001:41c9:1:400::32", // shenron ipv6
       "include:_spf.google.com", // Google GSuite
       "ip4:212.110.172.32",      // shenron ipv4
       "ip6:2001:41c9:1:400::32", // shenron ipv6


@@ -41,7 +40,6 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
       "ip6:2001:470:1:fa1::/64", // amsterdam external
       "ip4:184.104.226.96/27",   // dublin external
       "ip6:2001:470:1:b3b::/64", // dublin external
       "ip6:2001:470:1:fa1::/64", // amsterdam external
       "ip4:184.104.226.96/27",   // dublin external
       "ip6:2001:470:1:b3b::/64", // dublin external

-      "include:mailbox.org",     // mailbox.org

       "-all"
     ]
   }),
       "-all"
     ]
   }),


@@ -100,6 +98,11 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   CNAME("calendar", "ghs.googlehosted.com."),
   CNAME("sites", "ghs.googlehosted.com."),
 
   CNAME("calendar", "ghs.googlehosted.com."),
   CNAME("sites", "ghs.googlehosted.com."),
 

+  // Aliases for mailbox.org services
+
+  CNAME("autoconfig", "mailbox.org."),
+  SRV("_hkps._tcp", 1, 1, 443, "pgp.mailbox.org."),
+

   // Main web server and it's aliases
 
   A("@", RIDLEY_IPV4),
   // Main web server and it's aliases
 
   A("@", RIDLEY_IPV4),


@@ -107,6 +110,9 @@ D(DOMAIN, REGISTRAR, DnsProvider(PROVIDER),
   A("wiki", RIDLEY_IPV4),
   A("blog", RIDLEY_IPV4),
 
   A("wiki", RIDLEY_IPV4),
   A("blog", RIDLEY_IPV4),
 

+  A("staging.blog", FUME_IPV4),
+  AAAA("staging.blog", FUME_IPV6),
+

   A("crm", RIDLEY_IPV4),
   A("join", RIDLEY_IPV4),
   A("support", RIDLEY_IPV4),
   A("crm", RIDLEY_IPV4),
   A("join", RIDLEY_IPV4),
   A("support", RIDLEY_IPV4),