X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/d1b72774de56d34f1ebd9ace74b48c51af97fb9d..9388bca85739666caefcc9acfefb78309ae4360e:/data/openstreetmaps.org

diff --git a/data/openstreetmaps.org b/data/openstreetmaps.org
index 2b4abcc..65feb83 100644
--- a/data/openstreetmaps.org
+++ b/data/openstreetmaps.org
@@ -12,12 +12,14 @@
 
 @openstreetmaps.org:89.16.179.150:a:10
 @openstreetmaps.org::backup.mx.bytemark.co.uk:20
-@otrs.openstreetmaps.org:89.16.179.150:a:10
-@messages.openstreetmaps.org:89.16.179.150:a:10
+@otrs.openstreetmaps.org::a.mx.openstreetmaps.org:10
+@messages.openstreetmaps.org::a.mx.openstreetmaps.org:10
 
-# Publish an SPF record indicating that only idris sends mail
+3a.mx.openstreetmaps.org:200141c800100996021d7dfffec3df70
 
-'openstreetmaps.org:v=spf1 ip4\07289.16.179.150 ~all
+# Publish an SPF record indicating that only shenron sends mail
+
+'openstreetmaps.org: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.openstreetmaps.org:128.40.168.101
-+katie.internal.openstreetmaps.org:10.0.0.6
-+nominatim.openstreetmaps.org:128.40.168.101
++poldi.openstreetmaps.org:128.40.168.106 
++poldi.internal.openstreetmaps.org:10.0.0.16
++poldi.ilo.openstreetmaps.org:10.0.0.66
++nominatim.openstreetmaps.org:128.40.168.106
 
 # Gazetteer (namefinder) server
 
@@ -68,6 +71,20 @@
 +xapi.openstreetmaps.org:128.40.168.97
 +fafnir.internal.openstreetmaps.org:10.0.0.4
 
+# OWL server
+
++albi.openstreetmaps.org:128.40.168.95
++owl.openstreetmaps.org:128.40.168.95
++albi.internal.openstreetmaps.org:10.0.0.2
++albi.ilo.openstreetmaps.org:10.0.0.52
+
+# Spare server
+
++azure.openstreetmaps.org:128.40.168.100
++jxapi.openstreetmaps.org:128.40.168.100
++azure.internal.openstreetmaps.org:10.0.0.5
++azure.ilo.openstreetmaps.org:10.0.0.55
+
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmaps.org:128.40.168.104
@@ -82,6 +99,9 @@
 
 +horntail.openstreetmaps.org:128.40.168.99
 +munin.openstreetmaps.org:128.40.168.99
++apt.openstreetmaps.org:128.40.168.99
++stats.openstreetmaps.org:128.40.168.99
++chef.openstreetmaps.org:128.40.168.99
 +backup.openstreetmaps.org:10.0.0.7
 +horntail.internal.openstreetmaps.org:10.0.0.7
 +horntail.ilo.openstreetmaps.org:10.1.0.7
@@ -105,10 +125,6 @@
 
 # Development server with wildcard alias for user sites
 
-+old-dev.openstreetmaps.org:128.40.168.100
-+*.old-dev.openstreetmaps.org:128.40.168.100
-+old-dev.internal.openstreetmaps.org:10.0.0.5
-
 +errol.openstreetmaps.org:128.40.168.103
 +dev.openstreetmaps.org:128.40.168.103
 +*.dev.openstreetmaps.org:128.40.168.103
@@ -135,18 +151,11 @@
 
 +planet.openstreetmaps.org:128.40.168.99
 
-# Spare servers
-
-+dulcy.internal.openstreetmaps.org:10.0.0.2
-
-+idris.openstreetmaps.org:89.16.177.88
-+idris.internal.openstreetmaps.org:10.0.0.253
-
-+vm.openstreetmaps.org:80.68.94.95
-
 # APC power switch
 
 +apc1.internal.openstreetmaps.org:10.0.0.49
++apc2.internal.openstreetmaps.org:10.0.0.50
++apc3.internal.openstreetmaps.org:10.0.0.51
 
 # Forum server
 
@@ -162,8 +171,19 @@
 +trac.openstreetmaps.org:89.16.179.150
 +irc.openstreetmaps.org:89.16.179.150
 +help.openstreetmaps.org:89.16.179.150
++shop.openstreetmaps.org:89.16.179.150
 +shenron.internal.openstreetmaps.org:10.0.0.251
 
+3shenron.openstreetmaps.org:200141c800100996021d7dfffec3df70
+3mail.openstreetmaps.org:200141c800100996021d7dfffec3df70
+3lists.openstreetmaps.org:200141c800100996021d7dfffec3df70
+3svn.openstreetmaps.org:200141c800100996021d7dfffec3df70
+3git.openstreetmaps.org:200141c800100996021d7dfffec3df70
+3trac.openstreetmaps.org:200141c800100996021d7dfffec3df70
+3irc.openstreetmaps.org:200141c800100996021d7dfffec3df70
+3help.openstreetmaps.org:200141c800100996021d7dfffec3df70
+3shop.openstreetmaps.org:200141c800100996021d7dfffec3df70
+
 # Wiki server
 
 +konqi.openstreetmaps.org:193.63.75.26
@@ -172,6 +192,10 @@
 +wiki.openstreetmaps.org:193.63.75.26
 +dump.wiki.openstreetmaps.org:193.63.75.26
 
+# Tile cache server
+
++orm.openstreetmaps.org:193.63.75.98
+
 # Blog aggregator (on Shaun McDonald's VM)
 
 +blogs.openstreetmaps.org:89.16.175.12
@@ -184,10 +208,6 @@
 
 +donate.openstreetmaps.org:89.145.67.86
 
-# Our shop
-
-Cshop.openstreetmaps.org:virtual.fotopic.net
-
 # HOT site
 
 +hot.openstreetmaps.org:69.163.129.108