Move ascalon's external IP to pummelzacken

[dns.git] / src / osmfoundation

diff --git a/src/osmfoundation b/src/osmfoundation
index 5f2ab5f36104ccafbf8261d1973d3ecd6f147b4e..5df994b362fcb36e7c794f8f938739116682063b 100644 (file)
--- a/src/osmfoundation
+++ b/src/osmfoundation
@@ -20,34 +20,38 @@
 @osmfoundation::aspmx2.googlemail.com:10:3600
 @osmfoundation::aspmx3.googlemail.com:10:3600
 
 @osmfoundation::aspmx2.googlemail.com:10:3600
 @osmfoundation::aspmx3.googlemail.com:10:3600
 

+# Handle mail for the crm subdomain ourselves
+
+@crm.osmfoundation::a.mx.openstreetmap.org:10
+

 # Add DKIM public key
 # Use : raw to workaround TXT split issue
 # 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
 
 :google._domainkey.osmfoundation:16:\352v=DKIM1;\040k=rsa;\040p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCJmTBAkYRCocCCNtVsdRNMlQel8kNfjPYJpjEm7woEgZh9yZeDzxImtz+u73oUF4+7bXzrNYbP946WNQIwAba1J69he8L1qfPBJLd3Z\057fgmuaGdWcxpDno2EY4cQ8PrzvI6Vfm+6YAFANl8w09CIg41ykdlzH4iUJXD35k3SIl3wIDAQAB:900
 

-#Add XMPP chat servers for compatibility
+# 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
 
 :_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
 

-# Alias for login
+# Aliases for google services

 
 Clogin.osmfoundation:ghs.google.com
 
 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
 
 
 # Main web server and it's aliases
 

-+osmfoundation:128.40.168.102
++osmfoundation:128.40.168.102:600

 +old.osmfoundation:128.40.168.102
 +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
 +crm.osmfoundation:128.40.168.102
 +vote.osmfoundation:128.40.168.102
 +accounts.osmfoundation:128.40.168.102
 +crm.osmfoundation:128.40.168.102

-
-# easy alias
-Cdocs.osmfoundation:ghs.google.com
-Cmail.osmfoundation:ghs.google.com
-Ccalendar.osmfoundation:ghs.google.com
-Csites.osmfoundation:ghs.google.com