Replace civicrm.openstreetmap.org with crm.osmfoundation.org

diff --git a/data/openstreetmap.com b/data/openstreetmap.com
index a6ab1c11c785cc64922331607670c6d115bd42b8..72fbed85dd9c56b80aa0af92d2459ce43fa4f03e 100644 (file)
--- a/data/openstreetmap.com
+++ b/data/openstreetmap.com
@@ -145,7 +145,6 @@
 +otrs.openstreetmap.com:128.40.168.102
 +blog.openstreetmap.com:128.40.168.102
 +foundation.openstreetmap.com:128.40.168.102
 +otrs.openstreetmap.com:128.40.168.102
 +blog.openstreetmap.com:128.40.168.102
 +foundation.openstreetmap.com:128.40.168.102

-+civicrm.openstreetmap.com:128.40.168.102

 +ridley.internal.openstreetmap.com:10.0.0.3
 
 # Planet dumps are currently served from horntail
 +ridley.internal.openstreetmap.com:10.0.0.3
 
 # Planet dumps are currently served from horntail

diff --git a/data/openstreetmap.net b/data/openstreetmap.net
index b95f6aeca2cedd060701f13b9cad94d3e85c5034..e4b88ea3988939fd106f07fade94c7ffed1f3a8b 100644 (file)
--- a/data/openstreetmap.net
+++ b/data/openstreetmap.net
@@ -145,7 +145,6 @@
 +otrs.openstreetmap.net:128.40.168.102
 +blog.openstreetmap.net:128.40.168.102
 +foundation.openstreetmap.net:128.40.168.102
 +otrs.openstreetmap.net:128.40.168.102
 +blog.openstreetmap.net:128.40.168.102
 +foundation.openstreetmap.net:128.40.168.102

-+civicrm.openstreetmap.net:128.40.168.102

 +ridley.internal.openstreetmap.net:10.0.0.3
 
 # Planet dumps are currently served from horntail
 +ridley.internal.openstreetmap.net:10.0.0.3
 
 # Planet dumps are currently served from horntail

diff --git a/data/openstreetmap.org b/data/openstreetmap.org
index ae02762834c8c090f8e9d1d67dda6a1e8ca0fea2..bb79505db8a00b9204f8b3493e3eb1671cabf39e 100644 (file)
--- a/data/openstreetmap.org
+++ b/data/openstreetmap.org
@@ -145,7 +145,6 @@
 +otrs.openstreetmap.org:128.40.168.102
 +blog.openstreetmap.org:128.40.168.102
 +foundation.openstreetmap.org:128.40.168.102
 +otrs.openstreetmap.org:128.40.168.102
 +blog.openstreetmap.org:128.40.168.102
 +foundation.openstreetmap.org:128.40.168.102

-+civicrm.openstreetmap.org:128.40.168.102

 +ridley.internal.openstreetmap.org:10.0.0.3
 
 # Planet dumps are currently served from horntail
 +ridley.internal.openstreetmap.org:10.0.0.3
 
 # Planet dumps are currently served from horntail

diff --git a/data/openstreetmaps.org b/data/openstreetmaps.org
index 41aae006b38981bcc2579889cd79ac1865f458ef..75e4564fb7b73706a5735ed42fccf8fa10c412f5 100644 (file)
--- a/data/openstreetmaps.org
+++ b/data/openstreetmaps.org
@@ -145,7 +145,6 @@
 +otrs.openstreetmaps.org:128.40.168.102
 +blog.openstreetmaps.org:128.40.168.102
 +foundation.openstreetmaps.org:128.40.168.102
 +otrs.openstreetmaps.org:128.40.168.102
 +blog.openstreetmaps.org:128.40.168.102
 +foundation.openstreetmaps.org:128.40.168.102

-+civicrm.openstreetmaps.org:128.40.168.102

 +ridley.internal.openstreetmaps.org:10.0.0.3
 
 # Planet dumps are currently served from horntail
 +ridley.internal.openstreetmaps.org:10.0.0.3
 
 # Planet dumps are currently served from horntail

diff --git a/data/osm.org b/data/osm.org
index 29520c2545d7bb6e809f2d828113041fb9a69992..7bc99cfd9502f7546b168fe74cba7c153ec3fca8 100644 (file)
--- a/data/osm.org
+++ b/data/osm.org
@@ -145,7 +145,6 @@
 +otrs.osm.org:128.40.168.102
 +blog.osm.org:128.40.168.102
 +foundation.osm.org:128.40.168.102
 +otrs.osm.org:128.40.168.102
 +blog.osm.org:128.40.168.102
 +foundation.osm.org:128.40.168.102

-+civicrm.osm.org:128.40.168.102

 +ridley.internal.osm.org:10.0.0.3
 
 # Planet dumps are currently served from horntail
 +ridley.internal.osm.org:10.0.0.3
 
 # Planet dumps are currently served from horntail

diff --git a/data/osmfoundation.org b/data/osmfoundation.org
index d3060b55d99f95cd0b4327977e4eb6909564dd0c..83a576f0f1993afda70ccfedc2800aa38f52e0db 100644 (file)
--- a/data/osmfoundation.org
+++ b/data/osmfoundation.org
@@ -20,6 +20,17 @@
 @osmfoundation.org::aspmx2.googlemail.com:10:3600
 @osmfoundation.org::aspmx3.googlemail.com:10:3600
 
 @osmfoundation.org::aspmx2.googlemail.com:10:3600
 @osmfoundation.org::aspmx3.googlemail.com:10:3600
 

+# Add DKIM public key
+# Use : raw to workaround TXT split issue
+:google._domainkey.osmfoundation.org:16:\352v=DKIM1;\040k=rsa;\040p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCJmTBAkYRCocCCNtVsdRNMlQel8kNfjPYJpjEm7woEgZh9yZeDzxImtz+u73oUF4+7bXzrNYbP946WNQIwAba1J69he8L1qfPBJLd3Z\057fgmuaGdWcxpDno2EY4cQ8PrzvI6Vfm+6YAFANl8w09CIg41ykdlzH4iUJXD35k3SIl3wIDAQAB:900
+
+#Add XMPP chat servers for compatibility
+:_xmpp-server._tcp.osmfoundation.org:33:\000\005\000\000\024\225\013xmpp-server\001l\006google\003com\000
+:_xmpp-server._tcp.osmfoundation.org:33:\000\024\000\000\024\225\014xmpp-server1\001l\006google\003com\000
+:_xmpp-server._tcp.osmfoundation.org:33:\000\024\000\000\024\225\014xmpp-server2\001l\006google\003com\000
+:_xmpp-server._tcp.osmfoundation.org:33:\000\024\000\000\024\225\014xmpp-server3\001l\006google\003com\000
+:_xmpp-server._tcp.osmfoundation.org:33:\000\024\000\000\024\225\014xmpp-server4\001l\006google\003com\000
+

 # Alias for login
 
 Clogin.osmfoundation.org:ghs.google.com
 # Alias for login
 
 Clogin.osmfoundation.org:ghs.google.com


@@ -33,4 +44,10 @@ Clogin.osmfoundation.org:ghs.google.com
 +blog.osmfoundation.org:128.40.168.102
 +vote.osmfoundation.org:128.40.168.102
 +accounts.osmfoundation.org:128.40.168.102
 +blog.osmfoundation.org:128.40.168.102
 +vote.osmfoundation.org:128.40.168.102
 +accounts.osmfoundation.org:128.40.168.102

++crm.osmfoundation.org:128.40.168.102
+
+# easy alias

 Cdocs.osmfoundation.org:ghs.google.com
 Cdocs.osmfoundation.org:ghs.google.com

+Cmail.osmfoundation.org:ghs.google.com
+Ccalendar.osmfoundation.org:ghs.google.com
+Csites.osmfoundation.org:ghs.google.com

diff --git a/src/openstreetmap b/src/openstreetmap
index ff6c8ad69ddbdb660452f0ed4373e25bd220260f..b0882124b41a2871a4835c15f6229fc7efa78307 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -145,7 +145,6 @@
 +otrs.openstreetmap:128.40.168.102
 +blog.openstreetmap:128.40.168.102
 +foundation.openstreetmap:128.40.168.102
 +otrs.openstreetmap:128.40.168.102
 +blog.openstreetmap:128.40.168.102
 +foundation.openstreetmap:128.40.168.102

-+civicrm.openstreetmap:128.40.168.102

 +ridley.internal.openstreetmap:10.0.0.3
 
 # Planet dumps are currently served from horntail
 +ridley.internal.openstreetmap:10.0.0.3
 
 # Planet dumps are currently served from horntail

diff --git a/src/osmfoundation b/src/osmfoundation
index 7d6f11e36fa95b2dd7b9b281fd9c107198b72482..5f2ab5f36104ccafbf8261d1973d3ecd6f147b4e 100644 (file)
--- a/src/osmfoundation
+++ b/src/osmfoundation
@@ -44,6 +44,7 @@ Clogin.osmfoundation:ghs.google.com
 +blog.osmfoundation:128.40.168.102
 +vote.osmfoundation:128.40.168.102
 +accounts.osmfoundation:128.40.168.102
 +blog.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
 
 # easy alias
 Cdocs.osmfoundation:ghs.google.com