X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/a040c5b6c12a41ee12d77a564b8d46f39d46c858..17c972a95331b81f50aff441ac198186ce201101:/data/openstreetmaps.org diff --git a/data/openstreetmaps.org b/data/openstreetmaps.org index c747d3d..be8c247 100644 --- a/data/openstreetmaps.org +++ b/data/openstreetmaps.org @@ -10,32 +10,32 @@ # Make the virtual machine the primary MX with Bytemark as backup -@openstreetmaps.org:89.16.177.88:a:10 +@openstreetmaps.org:89.16.179.150:a:10 @openstreetmaps.org::backup.mx.bytemark.co.uk:20 -@otrs.openstreetmaps.org:89.16.177.88:a:10 -@messages.openstreetmaps.org:89.16.177.88:a:10 +@otrs.openstreetmaps.org:89.16.179.150:a:10 +@messages.openstreetmaps.org:89.16.179.150:a:10 -# Publish an SPF record indicating that only idris sends mail +# Publish an SPF record indicating that only shenron sends mail -'openstreetmaps.org:v=spf1 ip4\07289.16.177.88 ~all +'openstreetmaps.org:v=spf1 ip4\07289.16.179.150 ~all # Main web servers and their aliases +puff.openstreetmaps.org:128.40.168.98 -+openstreetmaps.org:128.40.168.98 -+www.openstreetmaps.org:128.40.168.98 -+api.openstreetmaps.org:128.40.168.98 -+maps.openstreetmaps.org:128.40.168.98 -+mapz.openstreetmaps.org:128.40.168.98 ++openstreetmaps.org:128.40.168.98:3600 ++www.openstreetmaps.org:128.40.168.98:3600 ++api.openstreetmaps.org:128.40.168.98:3600 ++maps.openstreetmaps.org:128.40.168.98:3600 ++mapz.openstreetmaps.org:128.40.168.98:3600 +puff.internal.openstreetmaps.org:10.0.0.8 +puff.ilo.openstreetmaps.org:10.0.0.58 +fuchur.openstreetmaps.org:128.40.168.105 -+openstreetmaps.org:128.40.168.105 -+www.openstreetmaps.org:128.40.168.105 -+api.openstreetmaps.org:128.40.168.105 -+maps.openstreetmaps.org:128.40.168.105 -+mapz.openstreetmaps.org:128.40.168.105 ++openstreetmaps.org:128.40.168.105:3600 ++www.openstreetmaps.org:128.40.168.105:3600 ++api.openstreetmaps.org:128.40.168.105:3600 ++maps.openstreetmaps.org:128.40.168.105:3600 ++mapz.openstreetmaps.org:128.40.168.105:3600 +fuchur.internal.openstreetmaps.org:10.0.0.9 +fuchur.ilo.openstreetmaps.org:10.0.0.59 @@ -53,9 +53,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,13 +69,26 @@ +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 ++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 -+tile.openstreetmaps.org:128.40.168.104 -+a.tile.openstreetmaps.org:128.40.168.104 -+b.tile.openstreetmaps.org:128.40.168.104 -+c.tile.openstreetmaps.org:128.40.168.104 ++tile.openstreetmaps.org:128.40.168.104:3600 ++a.tile.openstreetmaps.org:128.40.168.104:3600 ++b.tile.openstreetmaps.org:128.40.168.104:3600 ++c.tile.openstreetmaps.org:128.40.168.104:3600 +yevaud.internal.openstreetmaps.org:10.0.0.15 +yevaud.ilo.openstreetmaps.org:10.0.0.65 @@ -105,10 +119,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,35 +145,36 @@ +planet.openstreetmaps.org:128.40.168.99 -# Spare servers - -+dulcy.internal.openstreetmaps.org:10.0.0.2 - # 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 +forum.openstreetmaps.org:93.186.179.231 -# Bytemark virtual machine, and the services which operate from it - -+vm.openstreetmaps.org:80.68.94.95 -+stats.wiki.openstreetmaps.org:80.68.94.95 -+vm.internal.openstreetmaps.org:10.0.0.253 - -# Bytemark atom machine, and the services which operate from it - -+idris.openstreetmaps.org:89.16.177.88 -+mail.openstreetmaps.org:89.16.177.88 -+lists.openstreetmaps.org:89.16.177.88 -+svn.openstreetmaps.org:89.16.177.88 -+git.openstreetmaps.org:89.16.177.88 -+trac.openstreetmaps.org:89.16.177.88 -+irc.openstreetmaps.org:89.16.177.88 -+help.openstreetmaps.org:89.16.177.88 -+idris.internal.openstreetmaps.org:10.0.0.253 +# Bytemark machine, and the services which operate from it + ++shenron.openstreetmaps.org:89.16.179.150 ++mail.openstreetmaps.org:89.16.179.150 ++lists.openstreetmaps.org:89.16.179.150 ++svn.openstreetmaps.org:89.16.179.150 ++git.openstreetmaps.org:89.16.179.150 ++trac.openstreetmaps.org:89.16.179.150 ++irc.openstreetmaps.org:89.16.179.150 ++help.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 # Wiki server