Add civicrm.openstreetmap.org

[dns.git] / data / osm.org

diff --git a/data/osm.org b/data/osm.org
index 6fb42522b841f1327722f91752148c3fa18b8875..29520c2545d7bb6e809f2d828113041fb9a69992 100644 (file)
--- a/data/osm.org
+++ b/data/osm.org
@@ -12,10 +12,10 @@
 
 @osm.org:89.16.179.150:a:10
 @osm.org::backup.mx.bytemark.co.uk:20
-@otrs.osm.org::a.mx.osm.org.org:10
-@messages.osm.org::a.mx.osm.org.org:10
+@otrs.osm.org::a.mx.osm.org:10
+@messages.osm.org::a.mx.osm.org:10
 
-3:a.mx.osm.org.org:200141c800100996021d7dfffec3df70
+3a.mx.osm.org:200141c800100996021d7dfffec3df70
 
 # Publish an SPF record indicating that only shenron sends mail
 
@@ -81,16 +81,17 @@
 # Spare server
 
 +azure.osm.org:128.40.168.100
++jxapi.osm.org:128.40.168.100
 +azure.internal.osm.org:10.0.0.5
 +azure.ilo.osm.org:10.0.0.55
 
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.osm.org:128.40.168.104
-+tile.osm.org:128.40.168.104:3600
-+a.tile.osm.org:128.40.168.104:3600
-+b.tile.osm.org:128.40.168.104:3600
-+c.tile.osm.org:128.40.168.104:3600
++tile.osm.org:193.63.75.26:1800
++a.tile.osm.org:193.63.75.26:900
++b.tile.osm.org:128.40.168.95:900
++c.tile.osm.org:128.40.168.95:900
 +yevaud.internal.osm.org:10.0.0.15
 +yevaud.ilo.osm.org:10.0.0.65
 
@@ -98,9 +99,12 @@
 
 +horntail.osm.org:128.40.168.99
 +munin.osm.org:128.40.168.99
++apt.osm.org:128.40.168.99
++stats.osm.org:128.40.168.99
++chef.osm.org:128.40.168.99
 +backup.osm.org:10.0.0.7
 +horntail.internal.osm.org:10.0.0.7
-+horntail.ilo.osm.org:10.1.0.7
++horntail.ilo.osm.org:10.0.0.57
 
 # Osmarender tile server, with wildcard alias to allow parallel loading
 
@@ -141,6 +145,7 @@
 +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
@@ -167,6 +172,7 @@
 +trac.osm.org:89.16.179.150
 +irc.osm.org:89.16.179.150
 +help.osm.org:89.16.179.150
++shop.osm.org:89.16.179.150
 +shenron.internal.osm.org:10.0.0.251
 
 3shenron.osm.org:200141c800100996021d7dfffec3df70
@@ -175,8 +181,8 @@
 3svn.osm.org:200141c800100996021d7dfffec3df70
 3git.osm.org:200141c800100996021d7dfffec3df70
 3trac.osm.org:200141c800100996021d7dfffec3df70
-3irc.osm.org:200141c800100996021d7dfffec3df70
 3help.osm.org:200141c800100996021d7dfffec3df70
+3shop.osm.org:200141c800100996021d7dfffec3df70
 
 # Wiki server
 
@@ -186,6 +192,10 @@
 +wiki.osm.org:193.63.75.26
 +dump.wiki.osm.org:193.63.75.26
 
+# Tile cache server
+
++orm.osm.org:193.63.75.98
+
 # Blog aggregator (on Shaun McDonald's VM)
 
 +blogs.osm.org:89.16.175.12
@@ -198,10 +208,6 @@
 
 +donate.osm.org:89.145.67.86
 
-# Our shop
-
-Cshop.osm.org:virtual.fotopic.net
-
 # HOT site
 
 +hot.osm.org:69.163.129.108