X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/fb59945be9a8e47223ce79de0aa2e3cab3649664..b2062c65169da682b653654ac36323773486c6e4:/data/openstreetmap.org

diff --git a/data/openstreetmap.org b/data/openstreetmap.org
index 6f295c1..89f3112 100644
--- a/data/openstreetmap.org
+++ b/data/openstreetmap.org
@@ -12,10 +12,10 @@
 
 @openstreetmap.org:89.16.179.150:a:10
 @openstreetmap.org::backup.mx.bytemark.co.uk:20
-@otrs.openstreetmap.org::a.mx.openstreetmap.org.org:10
-@messages.openstreetmap.org::a.mx.openstreetmap.org.org:10
+@otrs.openstreetmap.org::a.mx.openstreetmap.org:10
+@messages.openstreetmap.org::a.mx.openstreetmap.org:10
 
-3:a.mx.openstreetmap.org.org:200141c800100996021d7dfffec3df70
+3a.mx.openstreetmap.org:200141c800100996021d7dfffec3df70
 
 # Publish an SPF record indicating that only shenron sends mail
 
@@ -81,16 +81,17 @@
 # Spare server
 
 +azure.openstreetmap.org:128.40.168.100
++jxapi.openstreetmap.org:128.40.168.100
 +azure.internal.openstreetmap.org:10.0.0.5
 +azure.ilo.openstreetmap.org:10.0.0.55
 
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmap.org:128.40.168.104
-+tile.openstreetmap.org:128.40.168.104:3600
-+a.tile.openstreetmap.org:128.40.168.104:3600
-+b.tile.openstreetmap.org:128.40.168.104:3600
-+c.tile.openstreetmap.org:128.40.168.104:3600
++tile.openstreetmap.org:193.63.75.26:1800
++a.tile.openstreetmap.org:193.63.75.26:900
++b.tile.openstreetmap.org:128.40.168.95:900
++c.tile.openstreetmap.org:128.40.168.95:900
 +yevaud.internal.openstreetmap.org:10.0.0.15
 +yevaud.ilo.openstreetmap.org:10.0.0.65
 
@@ -98,9 +99,12 @@
 
 +horntail.openstreetmap.org:128.40.168.99
 +munin.openstreetmap.org:128.40.168.99
++apt.openstreetmap.org:128.40.168.99
++stats.openstreetmap.org:128.40.168.99
++chef.openstreetmap.org:128.40.168.99
 +backup.openstreetmap.org:10.0.0.7
 +horntail.internal.openstreetmap.org:10.0.0.7
-+horntail.ilo.openstreetmap.org:10.1.0.7
++horntail.ilo.openstreetmap.org:10.0.0.57
 
 # Osmarender tile server, with wildcard alias to allow parallel loading
 
@@ -167,6 +171,7 @@
 +trac.openstreetmap.org:89.16.179.150
 +irc.openstreetmap.org:89.16.179.150
 +help.openstreetmap.org:89.16.179.150
++shop.openstreetmap.org:89.16.179.150
 +shenron.internal.openstreetmap.org:10.0.0.251
 
 3shenron.openstreetmap.org:200141c800100996021d7dfffec3df70
@@ -175,8 +180,8 @@
 3svn.openstreetmap.org:200141c800100996021d7dfffec3df70
 3git.openstreetmap.org:200141c800100996021d7dfffec3df70
 3trac.openstreetmap.org:200141c800100996021d7dfffec3df70
-3irc.openstreetmap.org:200141c800100996021d7dfffec3df70
 3help.openstreetmap.org:200141c800100996021d7dfffec3df70
+3shop.openstreetmap.org:200141c800100996021d7dfffec3df70
 
 # Wiki server
 
@@ -186,6 +191,10 @@
 +wiki.openstreetmap.org:193.63.75.26
 +dump.wiki.openstreetmap.org:193.63.75.26
 
+# Tile cache server
+
++orm.openstreetmap.org:193.63.75.98
+
 # Blog aggregator (on Shaun McDonald's VM)
 
 +blogs.openstreetmap.org:89.16.175.12
@@ -198,10 +207,11 @@
 
 +donate.openstreetmap.org:89.145.67.86
 
-# Our shop
-
-Cshop.openstreetmap.org:virtual.fotopic.net
-
 # HOT site
 
 +hot.openstreetmap.org:69.163.129.108
+
+# Jochen Topf's taginfo service, running on openstreetmap.org.de hardware
+
++taginfo.openstreetmap.org:85.214.118.227
+3taginfo.openstreetmap.org:2a0102384000000003cac7808a7d7be2