X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/f665113ea210cca604ae50da1281b6dee1fd54f9..9388bca85739666caefcc9acfefb78309ae4360e:/data/openstreetmap.com?ds=inline

diff --git a/data/openstreetmap.com b/data/openstreetmap.com
index ceb4669..368dde5 100644
--- a/data/openstreetmap.com
+++ b/data/openstreetmap.com
@@ -10,14 +10,16 @@
 
 # Make the virtual machine the primary MX with Bytemark as backup
 
-@openstreetmap.com:89.16.177.88:a:10
+@openstreetmap.com:89.16.179.150:a:10
 @openstreetmap.com::backup.mx.bytemark.co.uk:20
-@otrs.openstreetmap.com:89.16.177.88:a:10
-@messages.openstreetmap.com:89.16.177.88:a:10
+@otrs.openstreetmap.com::a.mx.openstreetmap.com:10
+@messages.openstreetmap.com::a.mx.openstreetmap.com:10
 
-# Publish an SPF record indicating that only idris sends mail
+3a.mx.openstreetmap.com:200141c800100996021d7dfffec3df70
 
-'openstreetmap.com:v=spf1 ip4\07289.16.177.88 ~all
+# Publish an SPF record indicating that only shenron sends mail
+
+'openstreetmap.com:v=spf1 ip4\07289.16.179.150 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ~all
 
 # Main web servers and their aliases
 
@@ -53,9 +55,10 @@
 
 # Gazetteer (nominatim) server
 
-+katie.openstreetmap.com:128.40.168.101
-+katie.internal.openstreetmap.com:10.0.0.6
-+nominatim.openstreetmap.com:128.40.168.101
++poldi.openstreetmap.com:128.40.168.106 
++poldi.internal.openstreetmap.com:10.0.0.16
++poldi.ilo.openstreetmap.com:10.0.0.66
++nominatim.openstreetmap.com:128.40.168.106
 
 # Gazetteer (namefinder) server
 
@@ -68,6 +71,20 @@
 +xapi.openstreetmap.com:128.40.168.97
 +fafnir.internal.openstreetmap.com:10.0.0.4
 
+# OWL server
+
++albi.openstreetmap.com:128.40.168.95
++owl.openstreetmap.com:128.40.168.95
++albi.internal.openstreetmap.com:10.0.0.2
++albi.ilo.openstreetmap.com:10.0.0.52
+
+# Spare server
+
++azure.openstreetmap.com:128.40.168.100
++jxapi.openstreetmap.com:128.40.168.100
++azure.internal.openstreetmap.com:10.0.0.5
++azure.ilo.openstreetmap.com:10.0.0.55
+
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmap.com:128.40.168.104
@@ -82,6 +99,9 @@
 
 +horntail.openstreetmap.com:128.40.168.99
 +munin.openstreetmap.com:128.40.168.99
++apt.openstreetmap.com:128.40.168.99
++stats.openstreetmap.com:128.40.168.99
++chef.openstreetmap.com:128.40.168.99
 +backup.openstreetmap.com:10.0.0.7
 +horntail.internal.openstreetmap.com:10.0.0.7
 +horntail.ilo.openstreetmap.com:10.1.0.7
@@ -105,10 +125,6 @@
 
 # Development server with wildcard alias for user sites
 
-+old-dev.openstreetmap.com:128.40.168.100
-+*.old-dev.openstreetmap.com:128.40.168.100
-+old-dev.internal.openstreetmap.com:10.0.0.5
-
 +errol.openstreetmap.com:128.40.168.103
 +dev.openstreetmap.com:128.40.168.103
 +*.dev.openstreetmap.com:128.40.168.103
@@ -135,35 +151,38 @@
 
 +planet.openstreetmap.com:128.40.168.99
 
-# Spare servers
-
-+dulcy.internal.openstreetmap.com:10.0.0.2
-
 # APC power switch
 
 +apc1.internal.openstreetmap.com:10.0.0.49
++apc2.internal.openstreetmap.com:10.0.0.50
++apc3.internal.openstreetmap.com:10.0.0.51
 
 # Forum server
 
 +forum.openstreetmap.com:93.186.179.231
 
-# Bytemark virtual machine, and the services which operate from it
-
-+vm.openstreetmap.com:80.68.94.95
-+stats.wiki.openstreetmap.com:80.68.94.95
-+vm.internal.openstreetmap.com:10.0.0.253
-
-# Bytemark atom machine, and the services which operate from it
-
-+idris.openstreetmap.com:89.16.177.88
-+mail.openstreetmap.com:89.16.177.88
-+lists.openstreetmap.com:89.16.177.88
-+svn.openstreetmap.com:89.16.177.88
-+git.openstreetmap.com:89.16.177.88
-+trac.openstreetmap.com:89.16.177.88
-+irc.openstreetmap.com:89.16.177.88
-+help.openstreetmap.com:89.16.177.88
-+idris.internal.openstreetmap.com:10.0.0.253
+# Bytemark machine, and the services which operate from it
+
++shenron.openstreetmap.com:89.16.179.150
++mail.openstreetmap.com:89.16.179.150
++lists.openstreetmap.com:89.16.179.150
++svn.openstreetmap.com:89.16.179.150
++git.openstreetmap.com:89.16.179.150
++trac.openstreetmap.com:89.16.179.150
++irc.openstreetmap.com:89.16.179.150
++help.openstreetmap.com:89.16.179.150
++shop.openstreetmap.com:89.16.179.150
++shenron.internal.openstreetmap.com:10.0.0.251
+
+3shenron.openstreetmap.com:200141c800100996021d7dfffec3df70
+3mail.openstreetmap.com:200141c800100996021d7dfffec3df70
+3lists.openstreetmap.com:200141c800100996021d7dfffec3df70
+3svn.openstreetmap.com:200141c800100996021d7dfffec3df70
+3git.openstreetmap.com:200141c800100996021d7dfffec3df70
+3trac.openstreetmap.com:200141c800100996021d7dfffec3df70
+3irc.openstreetmap.com:200141c800100996021d7dfffec3df70
+3help.openstreetmap.com:200141c800100996021d7dfffec3df70
+3shop.openstreetmap.com:200141c800100996021d7dfffec3df70
 
 # Wiki server
 
@@ -173,6 +192,10 @@
 +wiki.openstreetmap.com:193.63.75.26
 +dump.wiki.openstreetmap.com:193.63.75.26
 
+# Tile cache server
+
++orm.openstreetmap.com:193.63.75.98
+
 # Blog aggregator (on Shaun McDonald's VM)
 
 +blogs.openstreetmap.com:89.16.175.12
@@ -185,10 +208,6 @@
 
 +donate.openstreetmap.com:89.145.67.86
 
-# Our shop
-
-Cshop.openstreetmap.com:virtual.fotopic.net
-
 # HOT site
 
 +hot.openstreetmap.com:69.163.129.108