X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/2c6ede3aa0c9acefab0ca350e2139823a83fecc4..e998b0150a15b3e5d464223e7da39f4f4c04d80c:/src/osmfoundation

diff --git a/src/osmfoundation b/src/osmfoundation
index 876eea4..a1c1dbd 100644
--- a/src/osmfoundation
+++ b/src/osmfoundation
@@ -10,7 +10,7 @@
 
 # SPF Record
 
-'osmfoundation:v=spf1 a\072idris.openstreetmap.org include\072aspmx.googlemail.com ~all:3600
+'osmfoundation:v=spf1 a\072shenron.openstreetmap.org include\072aspmx.googlemail.com ~all:3600
 
 # Let google handle email
 
@@ -20,17 +20,38 @@
 @osmfoundation::aspmx2.googlemail.com:10:3600
 @osmfoundation::aspmx3.googlemail.com:10:3600
 
-# Alias for login
+# Handle mail for the crm subdomain ourselves
+
+@crm.osmfoundation::a.mx.openstreetmap:10
+
+# Add DKIM public key
+# Use : raw to workaround TXT split issue
+
+:google._domainkey.osmfoundation:16:\352v=DKIM1;\040k=rsa;\040p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCJmTBAkYRCocCCNtVsdRNMlQel8kNfjPYJpjEm7woEgZh9yZeDzxImtz+u73oUF4+7bXzrNYbP946WNQIwAba1J69he8L1qfPBJLd3Z\057fgmuaGdWcxpDno2EY4cQ8PrzvI6Vfm+6YAFANl8w09CIg41ykdlzH4iUJXD35k3SIl3wIDAQAB:900
+
+# Add XMPP chat servers for compatibility
+
+:_xmpp-server._tcp.osmfoundation:33:\000\005\000\000\024\225\013xmpp-server\001l\006google\003com\000
+:_xmpp-server._tcp.osmfoundation:33:\000\024\000\000\024\225\014xmpp-server1\001l\006google\003com\000
+:_xmpp-server._tcp.osmfoundation:33:\000\024\000\000\024\225\014xmpp-server2\001l\006google\003com\000
+:_xmpp-server._tcp.osmfoundation:33:\000\024\000\000\024\225\014xmpp-server3\001l\006google\003com\000
+:_xmpp-server._tcp.osmfoundation:33:\000\024\000\000\024\225\014xmpp-server4\001l\006google\003com\000
+
+# Aliases for google services
 
 Clogin.osmfoundation:ghs.google.com
+Cdocs.osmfoundation:ghs.google.com
+Cmail.osmfoundation:ghs.google.com
+Ccalendar.osmfoundation:ghs.google.com
+Csites.osmfoundation:ghs.google.com
 
 # Main web server and it's aliases
 
-+osmfoundation:128.40.168.102
++osmfoundation:128.40.168.102:600
 +old.osmfoundation:128.40.168.102
-+www.osmfoundation:128.40.168.102
-+wiki.osmfoundation:128.40.168.102
-+blog.osmfoundation:128.40.168.102
++www.osmfoundation:128.40.168.102:600
++wiki.osmfoundation:128.40.168.102:600
++blog.osmfoundation:128.40.168.102:600
 +vote.osmfoundation:128.40.168.102
 +accounts.osmfoundation:128.40.168.102
-Cdocs.osmfoundation:ghs.google.com
++crm.osmfoundation:128.40.168.102