Remove bogus org suffixes.

[dns.git] / data / osm.org

diff --git a/data/osm.org b/data/osm.org
index bd2bd3625898c155babf364966d744cd51072bba..75882c6eb00957aa2ba66b76f9f4a7874c7d5e17 100644 (file)
--- a/data/osm.org
+++ b/data/osm.org
@@ -12,12 +12,14 @@
 
 @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
+
+3:a.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
 
@@ -53,9 +55,10 @@
 
 # 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 
++poldi.internal.osm.org:10.0.0.16
++poldi.ilo.osm.org:10.0.0.66
++nominatim.osm.org:128.40.168.106
 
 # Gazetteer (namefinder) server
 
@@ -68,6 +71,19 @@
 +xapi.osm.org:128.40.168.97
 +fafnir.internal.osm.org:10.0.0.4
 
+# OWL server
+
++albi.osm.org:128.40.168.95
++owl.osm.org:128.40.168.95
++albi.internal.osm.org:10.0.0.2
++albi.ilo.osm.org:10.0.0.52
+
+# Spare server
+
++azure.osm.org:128.40.168.100
++azure.internal.osm.org:10.0.0.5
++azure.ilo.osm.org:10.0.0.55
+
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.osm.org:128.40.168.104
@@ -131,13 +147,11 @@
 
 +planet.osm.org:128.40.168.99
 
-# Spare servers
-
-+dulcy.internal.osm.org:10.0.0.2
-
 # APC power switch
 
 +apc1.internal.osm.org:10.0.0.49
++apc2.internal.osm.org:10.0.0.50
++apc3.internal.osm.org:10.0.0.51
 
 # Forum server
 
@@ -155,6 +169,15 @@
 +help.osm.org:89.16.179.150
 +shenron.internal.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
+3irc.osm.org:200141c800100996021d7dfffec3df70
+3help.osm.org:200141c800100996021d7dfffec3df70
+
 # Wiki server
 
 +konqi.osm.org:193.63.75.26