X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/2c6ede3aa0c9acefab0ca350e2139823a83fecc4..e4e19ad4c9d2ae52e9b5284c3dbf9eb2ca406abd:/src/openstreetmap diff --git a/src/openstreetmap b/src/openstreetmap index 02d3ce1..b088212 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -10,26 +10,37 @@ # Make the virtual machine the primary MX with Bytemark as backup -@openstreetmap:89.16.177.88:a:10 +@openstreetmap:89.16.179.150:a:10 @openstreetmap::backup.mx.bytemark.co.uk:20 -@otrs.openstreetmap:89.16.177.88:a:10 -@messages.openstreetmap:89.16.177.88:a:10 +@otrs.openstreetmap::a.mx.openstreetmap:10 +@messages.openstreetmap::a.mx.openstreetmap:10 -# Publish an SPF record indicating that only idris sends mail +3a.mx.openstreetmap:200141c800100996021d7dfffec3df70 -'openstreetmap:v=spf1 ip4\07289.16.177.88 ~all +# Publish an SPF record indicating that only shenron sends mail -# Main web server and it's aliases +'openstreetmap:v=spf1 ip4\07289.16.179.150 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ~all + +# Main web servers and their aliases +puff.openstreetmap:128.40.168.98 -+openstreetmap:128.40.168.98 -+www.openstreetmap:128.40.168.98 -+api.openstreetmap:128.40.168.98 -+maps.openstreetmap:128.40.168.98 -+mapz.openstreetmap:128.40.168.98 ++openstreetmap:128.40.168.98:3600 ++www.openstreetmap:128.40.168.98:3600 ++api.openstreetmap:128.40.168.98:3600 ++maps.openstreetmap:128.40.168.98:3600 ++mapz.openstreetmap:128.40.168.98:3600 +puff.internal.openstreetmap:10.0.0.8 +puff.ilo.openstreetmap:10.0.0.58 ++fuchur.openstreetmap:128.40.168.105 ++openstreetmap:128.40.168.105:3600 ++www.openstreetmap:128.40.168.105:3600 ++api.openstreetmap:128.40.168.105:3600 ++maps.openstreetmap:128.40.168.105:3600 ++mapz.openstreetmap:128.40.168.105:3600 ++fuchur.internal.openstreetmap:10.0.0.9 ++fuchur.ilo.openstreetmap:10.0.0.59 + # Rails application servers +draco.internal.openstreetmap:10.0.0.10 @@ -44,9 +55,10 @@ # Gazetteer (nominatim) server -+katie.openstreetmap:128.40.168.101 -+katie.internal.openstreetmap:10.0.0.6 -+nominatim.openstreetmap:128.40.168.101 ++poldi.openstreetmap:128.40.168.106 ++poldi.internal.openstreetmap:10.0.0.16 ++poldi.ilo.openstreetmap:10.0.0.66 ++nominatim.openstreetmap:128.40.168.106 # Gazetteer (namefinder) server @@ -59,13 +71,27 @@ +xapi.openstreetmap:128.40.168.97 +fafnir.internal.openstreetmap:10.0.0.4 +# OWL server + ++albi.openstreetmap:128.40.168.95 ++owl.openstreetmap:128.40.168.95 ++albi.internal.openstreetmap:10.0.0.2 ++albi.ilo.openstreetmap:10.0.0.52 + +# Spare server + ++azure.openstreetmap:128.40.168.100 ++jxapi.openstreetmap:128.40.168.100 ++azure.internal.openstreetmap:10.0.0.5 ++azure.ilo.openstreetmap:10.0.0.55 + # Mapnik tile server, with wildcard alias to allow parallel loading +yevaud.openstreetmap:128.40.168.104 -+tile.openstreetmap:128.40.168.104 -+a.tile.openstreetmap:128.40.168.104 -+b.tile.openstreetmap:128.40.168.104 -+c.tile.openstreetmap:128.40.168.104 ++tile.openstreetmap:193.63.75.26:1800 ++a.tile.openstreetmap:193.63.75.26:900 ++b.tile.openstreetmap:128.40.168.95:900 ++c.tile.openstreetmap:128.40.168.95:900 +yevaud.internal.openstreetmap:10.0.0.15 +yevaud.ilo.openstreetmap:10.0.0.65 @@ -73,9 +99,12 @@ +horntail.openstreetmap:128.40.168.99 +munin.openstreetmap:128.40.168.99 ++apt.openstreetmap:128.40.168.99 ++stats.openstreetmap:128.40.168.99 ++chef.openstreetmap:128.40.168.99 +backup.openstreetmap:10.0.0.7 +horntail.internal.openstreetmap:10.0.0.7 -+horntail.ilo.openstreetmap:10.1.0.7 ++horntail.ilo.openstreetmap:10.0.0.57 # Osmarender tile server, with wildcard alias to allow parallel loading @@ -96,10 +125,6 @@ # Development server with wildcard alias for user sites -+old-dev.openstreetmap:128.40.168.100 -+*.old-dev.openstreetmap:128.40.168.100 -+old-dev.internal.openstreetmap:10.0.0.5 - +errol.openstreetmap:128.40.168.103 +dev.openstreetmap:128.40.168.103 +*.dev.openstreetmap:128.40.168.103 @@ -126,38 +151,37 @@ +planet.openstreetmap:128.40.168.99 -# Spare servers - -+fuchur.openstreetmap:128.40.168.105 -+fuchur.internal.openstreetmap:10.0.0.9 -+fuchur.ilo.openstreetmap:10.0.0.59 -+dulcy.internal.openstreetmap:10.0.0.2 - # APC power switch +apc1.internal.openstreetmap:10.0.0.49 ++apc2.internal.openstreetmap:10.0.0.50 ++apc3.internal.openstreetmap:10.0.0.51 # Forum server +forum.openstreetmap:93.186.179.231 -# Bytemark virtual machine, and the services which operate from it - -+vm.openstreetmap:80.68.94.95 -+stats.wiki.openstreetmap:80.68.94.95 -+vm.internal.openstreetmap:10.0.0.253 - -# Bytemark atom machine, and the services which operate from it - -+idris.openstreetmap:89.16.177.88 -+mail.openstreetmap:89.16.177.88 -+lists.openstreetmap:89.16.177.88 -+svn.openstreetmap:89.16.177.88 -+git.openstreetmap:89.16.177.88 -+trac.openstreetmap:89.16.177.88 -+irc.openstreetmap:89.16.177.88 -+help.openstreetmap:89.16.177.88 -+idris.internal.openstreetmap:10.0.0.253 +# Bytemark machine, and the services which operate from it + ++shenron.openstreetmap:89.16.179.150 ++mail.openstreetmap:89.16.179.150 ++lists.openstreetmap:89.16.179.150 ++svn.openstreetmap:89.16.179.150 ++git.openstreetmap:89.16.179.150 ++trac.openstreetmap:89.16.179.150 ++irc.openstreetmap:89.16.179.150 ++help.openstreetmap:89.16.179.150 ++shop.openstreetmap:89.16.179.150 ++shenron.internal.openstreetmap:10.0.0.251 + +3shenron.openstreetmap:200141c800100996021d7dfffec3df70 +3mail.openstreetmap:200141c800100996021d7dfffec3df70 +3lists.openstreetmap:200141c800100996021d7dfffec3df70 +3svn.openstreetmap:200141c800100996021d7dfffec3df70 +3git.openstreetmap:200141c800100996021d7dfffec3df70 +3trac.openstreetmap:200141c800100996021d7dfffec3df70 +3help.openstreetmap:200141c800100996021d7dfffec3df70 +3shop.openstreetmap:200141c800100996021d7dfffec3df70 # Wiki server @@ -167,6 +191,10 @@ +wiki.openstreetmap:193.63.75.26 +dump.wiki.openstreetmap:193.63.75.26 +# Tile cache server + ++orm.openstreetmap:193.63.75.98 + # Blog aggregator (on Shaun McDonald's VM) +blogs.openstreetmap:89.16.175.12 @@ -179,10 +207,6 @@ +donate.openstreetmap:89.145.67.86 -# Our shop - -Cshop.openstreetmap:virtual.fotopic.net - # HOT site +hot.openstreetmap:69.163.129.108