X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/d1b72774de56d34f1ebd9ace74b48c51af97fb9d..aecb684b2a08729e4308f3c876548263223cf2c5:/data/openstreetmap.org

diff --git a/data/openstreetmap.org b/data/openstreetmap.org
index 4d4d081..50f0a80 100644
--- a/data/openstreetmap.org
+++ b/data/openstreetmap.org
@@ -12,12 +12,14 @@
 
 @openstreetmap.org:89.16.179.150:a:10
 @openstreetmap.org::backup.mx.bytemark.co.uk:20
-@otrs.openstreetmap.org:89.16.179.150:a:10
-@messages.openstreetmap.org:89.16.179.150:a:10
+@otrs.openstreetmap.org::a.mx.openstreetmap.org:10
+@messages.openstreetmap.org::a.mx.openstreetmap.org:10
 
-# Publish an SPF record indicating that only idris sends mail
+3a.mx.openstreetmap.org:200141c800100996021d7dfffec3df70
 
-'openstreetmap.org:v=spf1 ip4\07289.16.179.150 ~all
+# Publish an SPF record indicating that only shenron sends mail
+
+'openstreetmap.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.openstreetmap.org:128.40.168.101
-+katie.internal.openstreetmap.org:10.0.0.6
-+nominatim.openstreetmap.org:128.40.168.101
++poldi.openstreetmap.org:128.40.168.106 
++poldi.internal.openstreetmap.org:10.0.0.16
++poldi.ilo.openstreetmap.org:10.0.0.66
++nominatim.openstreetmap.org:128.40.168.106
 
 # Gazetteer (namefinder) server
 
@@ -68,6 +71,19 @@
 +xapi.openstreetmap.org:128.40.168.97
 +fafnir.internal.openstreetmap.org:10.0.0.4
 
+# OWL server
+
++albi.openstreetmap.org:128.40.168.95
++owl.openstreetmap.org:128.40.168.95
++albi.internal.openstreetmap.org:10.0.0.2
++albi.ilo.openstreetmap.org:10.0.0.52
+
+# Spare server
+
++azure.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
@@ -105,10 +121,6 @@
 
 # Development server with wildcard alias for user sites
 
-+old-dev.openstreetmap.org:128.40.168.100
-+*.old-dev.openstreetmap.org:128.40.168.100
-+old-dev.internal.openstreetmap.org:10.0.0.5
-
 +errol.openstreetmap.org:128.40.168.103
 +dev.openstreetmap.org:128.40.168.103
 +*.dev.openstreetmap.org:128.40.168.103
@@ -135,18 +147,11 @@
 
 +planet.openstreetmap.org:128.40.168.99
 
-# Spare servers
-
-+dulcy.internal.openstreetmap.org:10.0.0.2
-
-+idris.openstreetmap.org:89.16.177.88
-+idris.internal.openstreetmap.org:10.0.0.253
-
-+vm.openstreetmap.org:80.68.94.95
-
 # APC power switch
 
 +apc1.internal.openstreetmap.org:10.0.0.49
++apc2.internal.openstreetmap.org:10.0.0.50
++apc3.internal.openstreetmap.org:10.0.0.51
 
 # Forum server
 
@@ -164,6 +169,15 @@
 +help.openstreetmap.org:89.16.179.150
 +shenron.internal.openstreetmap.org:10.0.0.251
 
+3shenron.openstreetmap.org:200141c800100996021d7dfffec3df70
+3mail.openstreetmap.org:200141c800100996021d7dfffec3df70
+3lists.openstreetmap.org:200141c800100996021d7dfffec3df70
+3svn.openstreetmap.org:200141c800100996021d7dfffec3df70
+3git.openstreetmap.org:200141c800100996021d7dfffec3df70
+3trac.openstreetmap.org:200141c800100996021d7dfffec3df70
+3irc.openstreetmap.org:200141c800100996021d7dfffec3df70
+3help.openstreetmap.org:200141c800100996021d7dfffec3df70
+
 # Wiki server
 
 +konqi.openstreetmap.org:193.63.75.26