X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/d0dbba638e315cc6750cdd846618128338efe774..81062ccc5049acd363403c0d39d60ad19e033849:/data/osm.org

diff --git a/data/osm.org b/data/osm.org
index cbec168..761729d 100644
--- a/data/osm.org
+++ b/data/osm.org
@@ -12,79 +12,103 @@
 
 @osm.org:89.16.179.150:a:10
 @osm.org::backup.mx.bytemark.co.uk:20
-@otrs.osm.org:89.16.179.150:a:10
-@messages.osm.org:89.16.179.150:a:10
+@otrs.osm.org::a.mx.osm.org:10
+@messages.osm.org::a.mx.osm.org:10
+
+3a.mx.osm.org:200141c800100996021d7dfffec3df70
 
 # Publish an SPF record indicating that only shenron sends mail
 
-'osm.org:v=spf1 ip4\07289.16.179.150 ~all
+'osm.org:v=spf1 ip4\07289.16.179.150 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ~all
 
 # Main web servers and their aliases
 
-+puff.osm.org:128.40.168.98
-+osm.org:128.40.168.98:3600
-+www.osm.org:128.40.168.98:3600
-+api.osm.org:128.40.168.98:3600
-+maps.osm.org:128.40.168.98:3600
-+mapz.osm.org:128.40.168.98:3600
-+puff.internal.osm.org:10.0.0.8
-+puff.ilo.osm.org:10.0.0.58
-
-+fuchur.osm.org:128.40.168.105
-+osm.org:128.40.168.105:3600
-+www.osm.org:128.40.168.105:3600
-+api.osm.org:128.40.168.105:3600
-+maps.osm.org:128.40.168.105:3600
-+mapz.osm.org:128.40.168.105:3600
-+fuchur.internal.osm.org:10.0.0.9
-+fuchur.ilo.osm.org:10.0.0.59
++puff.osm.org:193.63.75.99
++osm.org:193.63.75.99:600
++www.osm.org:193.63.75.99:600
++api.osm.org:193.63.75.99:600
++maps.osm.org:193.63.75.99:600
++mapz.osm.org:193.63.75.99:600
++puff.ic.osm.org:146.179.159.162
++puff.oob.osm.org:146.179.159.188
+
++fuchur.osm.org:193.63.75.100
++osm.org:193.63.75.100:600
++www.osm.org:193.63.75.100:600
++api.osm.org:193.63.75.100:600
++maps.osm.org:193.63.75.100:600
++mapz.osm.org:193.63.75.100:600
++fuchur.ic.osm.org:146.179.159.163
++fuchur.oob.osm.org:146.179.159.187
 
 # Rails application servers
 
-+draco.internal.osm.org:10.0.0.10
-+rails1.internal.osm.org:10.0.0.10
-+draco.ilo.osm.org:10.0.0.60
-+sarel.internal.osm.org:10.0.0.11
-+rails2.internal.osm.org:10.0.0.11
-+sarel.ilo.osm.org:10.0.0.61
-+norbert.internal.osm.org:10.0.0.12
-+rails3.internal.osm.org:10.0.0.12
-+norbert.ilo.osm.org:10.0.0.62
++draco.ic.osm.org:146.179.159.165
++rails1.ic.osm.org:146.179.159.165
++draco.oob.osm.org:146.179.159.185
++sarel.ic.osm.org:146.179.159.166
++rails2.ic.osm.org:146.179.159.166
++sarel.oob.osm.org:146.179.159.184
++norbert.ic.osm.org:146.179.159.167
++rails3.ic.osm.org:146.179.159.167
++norbert.oob.osm.org:146.179.159.183
 
 # Gazetteer (nominatim) server
 
-+katie.osm.org:128.40.168.101
-+katie.internal.osm.org:10.0.0.6
-+nominatim.osm.org:128.40.168.101
++poldi.osm.org:128.40.168.106 
++nominatim.osm.org:128.40.168.106
++poldi.ucl.osm.org:10.0.0.16
++poldi.oob.osm.org:10.0.1.16
 
 # Gazetteer (namefinder) server
 
 +gazetteer.osm.org:128.40.168.96
-+gazetteer.internal.osm.org:10.0.0.1
++gazetteer.ucl.osm.org:10.0.0.1
 
 # XAPI server
 
 +fafnir.osm.org:128.40.168.97
 +xapi.osm.org:128.40.168.97
-+fafnir.internal.osm.org:10.0.0.4
++fafnir.ucl.osm.org:10.0.0.4
+
+# OWL server
+
++albi.osm.org:128.40.168.95
++owl.osm.org:128.40.168.95
++albi.ilo.osm.org:10.0.0.52
++albi.ucl.osm.org:10.0.0.2
++albi.oob.osm.org:10.0.1.2
+
+# Spare server
+
++azure.osm.org:128.40.168.100
++jxapi.osm.org:128.40.168.100
++azure.ilo.osm.org:10.0.0.55
++azure.ucl.osm.org:10.0.0.5
++azure.oob.osm.org:10.0.1.5
 
 # 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
-+yevaud.internal.osm.org:10.0.0.15
-+yevaud.ilo.osm.org:10.0.0.65
++tile.osm.org:193.63.75.26:600
++a.tile.osm.org:193.63.75.26:600
++b.tile.osm.org:128.40.168.95:600
++c.tile.osm.org:128.40.168.95:600
++yevaud.ucl.osm.org:10.0.0.15
++yevaud.oob.osm.org:10.0.1.15
 
 # Services machine
 
-+horntail.osm.org:128.40.168.99
-+munin.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.osm.org:193.63.75.101
++planet.osm.org:193.63.75.101
++munin.osm.org:193.63.75.101
++apt.osm.org:193.63.75.101
++stats.osm.org:193.63.75.101
++chef.osm.org:193.63.75.101
++backup.osm.org:193.63.75.101
++horntail.ic.osm.org:146.179.159.164
++backup.ic.osm.org:146.179.159.164
++horntail.oob.osm.org:146.179.159.186
 
 # Osmarender tile server, with wildcard alias to allow parallel loading
 
@@ -99,16 +123,12 @@
 
 # Database server
 
-+smaug.internal.osm.org:10.0.0.13
-+db.internal.osm.org:10.0.0.13:60
-+smaug.ilo.internal.osm.org:10.0.0.63
++smaug.ic.osm.org:146.179.159.168
++db.ic.osm.org:146.179.159.168
++smaug.oob.osm.org:146.179.159.182
 
 # Development server with wildcard alias for user sites
 
-+old-dev.osm.org:128.40.168.100
-+*.old-dev.osm.org:128.40.168.100
-+old-dev.internal.osm.org:10.0.0.5
-
 +errol.osm.org:128.40.168.103
 +dev.osm.org:128.40.168.103
 +*.dev.osm.org:128.40.168.103
@@ -121,7 +141,8 @@
 +a.os.osm.org:128.40.168.103
 +b.os.osm.org:128.40.168.103
 +c.os.osm.org:128.40.168.103
-+errol.ilo.osm.org:10.0.0.64
++errol.ucl.osm.org:10.0.0.14
++errol.oob.osm.org:10.0.1.14
 
 # Foundation server
 
@@ -129,19 +150,18 @@
 +otrs.osm.org:128.40.168.102
 +blog.osm.org:128.40.168.102
 +foundation.osm.org:128.40.168.102
-+ridley.internal.osm.org:10.0.0.3
-
-# Planet dumps are currently served from horntail
++ridley.ucl.osm.org:10.0.0.3
 
-+planet.osm.org:128.40.168.99
+# APC power switches
 
-# Spare servers
++apc1.ucl.osm.org:10.0.0.49
++apc2.ucl.osm.org:10.0.0.50
++apc3.ucl.osm.org:10.0.0.51
 
-+dulcy.internal.osm.org:10.0.0.2
+# Managed network switches
 
-# APC power switch
-
-+apc1.internal.osm.org:10.0.0.49
++switch1.osm.org:193.63.75.102
++switch2.ic.osm.org:146.179.159.169
 
 # Forum server
 
@@ -157,15 +177,32 @@
 +trac.osm.org:89.16.179.150
 +irc.osm.org:89.16.179.150
 +help.osm.org:89.16.179.150
-+shenron.internal.osm.org:10.0.0.251
++shop.osm.org:89.16.179.150
++shenron.bm.osm.org:10.0.0.251
+
+3shenron.osm.org:200141c800100996021d7dfffec3df70
+3mail.osm.org:200141c800100996021d7dfffec3df70
+3lists.osm.org:200141c800100996021d7dfffec3df70
+3svn.osm.org:200141c800100996021d7dfffec3df70
+3git.osm.org:200141c800100996021d7dfffec3df70
+3trac.osm.org:200141c800100996021d7dfffec3df70
+3help.osm.org:200141c800100996021d7dfffec3df70
+3shop.osm.org:200141c800100996021d7dfffec3df70
 
 # Wiki server
 
-+konqi.osm.org:193.63.75.26
-+konqi.ilo.osm.org:193.63.75.27
-+konqi.internal.osm.org:10.0.0.252
-+wiki.osm.org:193.63.75.26
-+dump.wiki.osm.org:193.63.75.26
++konqi.osm.org:193.63.75.26:600
++konqi.ilo.osm.org:193.63.75.27:600
++wiki.osm.org:193.63.75.26:600
++dump.wiki.osm.org:193.63.75.26:600
+#+konqi.ic.osm.org:10.0.16.1
+#+konqi.oob.osm.org:10.0.17.1
+
+# Tile cache server
+
++orm.osm.org:193.63.75.98
+#+orm.ic.osm.org:10.0.16.2
+#+orm.oob.osm.org:10.0.17.2
 
 # Blog aggregator (on Shaun McDonald's VM)
 
@@ -179,10 +216,11 @@
 
 +donate.osm.org:89.145.67.86
 
-# Our shop
-
-Cshop.osm.org:virtual.fotopic.net
-
 # HOT site
 
 +hot.osm.org:69.163.129.108
+
+# Jochen Topf's taginfo service, running on osm.org.de hardware
+
++taginfo.osm.org:85.214.118.227
+3taginfo.osm.org:2a0102384000000003cac7808a7d7be2