From e4e19ad4c9d2ae52e9b5284c3dbf9eb2ca406abd Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 9 Jun 2011 17:24:35 +0100 Subject: [PATCH] Replace civicrm.openstreetmap.org with crm.osmfoundation.org --- data/openstreetmap.com | 1 - data/openstreetmap.net | 1 - data/openstreetmap.org | 1 - data/openstreetmaps.org | 1 - data/osm.org | 1 - data/osmfoundation.org | 17 +++++++++++++++++ src/openstreetmap | 1 - src/osmfoundation | 1 + 8 files changed, 18 insertions(+), 6 deletions(-) diff --git a/data/openstreetmap.com b/data/openstreetmap.com index a6ab1c1..72fbed8 100644 --- 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 -+civicrm.openstreetmap.com:128.40.168.102 +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 b95f6ae..e4b88ea 100644 --- 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 -+civicrm.openstreetmap.net:128.40.168.102 +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 ae02762..bb79505 100644 --- 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 -+civicrm.openstreetmap.org:128.40.168.102 +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 41aae00..75e4564 100644 --- 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 -+civicrm.openstreetmaps.org:128.40.168.102 +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 29520c2..7bc99cf 100644 --- 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 -+civicrm.osm.org:128.40.168.102 +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 d3060b5..83a576f 100644 --- 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 +# 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 @@ -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 ++crm.osmfoundation.org:128.40.168.102 + +# easy alias 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 ff6c8ad..b088212 100644 --- 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 -+civicrm.openstreetmap:128.40.168.102 +ridley.internal.openstreetmap:10.0.0.3 # Planet dumps are currently served from horntail diff --git a/src/osmfoundation b/src/osmfoundation index 7d6f11e..5f2ab5f 100644 --- 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 ++crm.osmfoundation:128.40.168.102 # easy alias Cdocs.osmfoundation:ghs.google.com -- 2.43.2