# 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
+
+'openstreetmap:v=spf1 ip4\07289.16.179.150 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ~all
# Main web servers and their aliases
+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
++puff.ucl.openstreetmap:10.0.0.8
++puff.oob.openstreetmap:10.0.1.8
+fuchur.openstreetmap:128.40.168.105
+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
++fuchur.ucl.openstreetmap:10.0.0.9
++fuchur.oob.openstreetmap:10.0.1.9
# Rails application servers
-+draco.internal.openstreetmap:10.0.0.10
-+rails1.internal.openstreetmap:10.0.0.10
-+draco.ilo.openstreetmap:10.0.0.60
-+sarel.internal.openstreetmap:10.0.0.11
-+rails2.internal.openstreetmap:10.0.0.11
-+sarel.ilo.openstreetmap:10.0.0.61
-+norbert.internal.openstreetmap:10.0.0.12
-+rails3.internal.openstreetmap:10.0.0.12
-+norbert.ilo.openstreetmap:10.0.0.62
++draco.ucl.openstreetmap:10.0.0.10
++rails1.ucl.openstreetmap:10.0.0.10
++draco.oob.openstreetmap:10.0.1.10
++sarel.ucl.openstreetmap:10.0.0.11
++rails2.ucl.openstreetmap:10.0.0.11
++sarel.oob.openstreetmap:10.0.1.11
++norbert.ucl.openstreetmap:10.0.0.12
++rails3.ucl.openstreetmap:10.0.0.12
++norbert.oob.openstreetmap:10.0.1.12
# 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
++nominatim.openstreetmap:128.40.168.106
++poldi.ucl.openstreetmap:10.0.0.16
++poldi.oob.openstreetmap:10.0.1.16
# Gazetteer (namefinder) server
+gazetteer.openstreetmap:128.40.168.96
-+gazetteer.internal.openstreetmap:10.0.0.1
++gazetteer.ucl.openstreetmap:10.0.0.1
# XAPI server
+fafnir.openstreetmap:128.40.168.97
+xapi.openstreetmap:128.40.168.97
-+fafnir.internal.openstreetmap:10.0.0.4
++fafnir.ucl.openstreetmap:10.0.0.4
+
+# OWL server
+
++albi.openstreetmap:128.40.168.95
++owl.openstreetmap:128.40.168.95
++albi.ilo.openstreetmap:10.0.0.52
++albi.ucl.openstreetmap:10.0.0.2
++albi.oob.openstreetmap:10.0.1.2
+
+# Spare server
+
++azure.openstreetmap:128.40.168.100
++jxapi.openstreetmap:128.40.168.100
++azure.ilo.openstreetmap:10.0.0.55
++azure.ucl.openstreetmap:10.0.0.5
++azure.oob.openstreetmap:10.0.1.5
# Mapnik tile server, with wildcard alias to allow parallel loading
+yevaud.openstreetmap:128.40.168.104
-+tile.openstreetmap:128.40.168.104:3600
-+a.tile.openstreetmap:128.40.168.104:3600
-+b.tile.openstreetmap:128.40.168.104:3600
-+c.tile.openstreetmap:128.40.168.104:3600
-+yevaud.internal.openstreetmap:10.0.0.15
-+yevaud.ilo.openstreetmap:10.0.0.65
++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.ucl.openstreetmap:10.0.0.15
++yevaud.oob.openstreetmap:10.0.1.15
# Services machine
+horntail.openstreetmap:128.40.168.99
++planet.openstreetmap:128.40.168.99
+munin.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
++apt.openstreetmap:128.40.168.99
++stats.openstreetmap:128.40.168.99
++chef.openstreetmap:128.40.168.99
++backup.openstreetmap:128.40.168.99
++horntail.ucl.openstreetmap:10.0.0.7
++backup.ucl.openstreetmap:10.0.0.7
++horntail.oob.openstreetmap:10.0.1.7
# Osmarender tile server, with wildcard alias to allow parallel loading
# Database server
-+smaug.internal.openstreetmap:10.0.0.13
-+db.internal.openstreetmap:10.0.0.13:60
-+smaug.ilo.internal.openstreetmap:10.0.0.63
++smaug.ucl.openstreetmap:10.0.0.13
++db.ucl.openstreetmap:10.0.0.13:60
++smaug.oob.openstreetmap:10.0.1.13
# 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
+a.os.openstreetmap:128.40.168.103
+b.os.openstreetmap:128.40.168.103
+c.os.openstreetmap:128.40.168.103
-+errol.ilo.openstreetmap:10.0.0.64
++errol.ucl.openstreetmap:10.0.0.14
++errol.oob.openstreetmap:10.0.1.14
# Foundation server
+otrs.openstreetmap:128.40.168.102
+blog.openstreetmap:128.40.168.102
+foundation.openstreetmap:128.40.168.102
-+ridley.internal.openstreetmap:10.0.0.3
-
-# Planet dumps are currently served from horntail
-
-+planet.openstreetmap:128.40.168.99
-
-# Spare servers
-
-+dulcy.internal.openstreetmap:10.0.0.2
++ridley.ucl.openstreetmap:10.0.0.3
# APC power switch
-+apc1.internal.openstreetmap:10.0.0.49
++apc1.ucl.openstreetmap:10.0.0.49
++apc2.ucl.openstreetmap:10.0.0.50
++apc3.ucl.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.bm.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
+konqi.openstreetmap:193.63.75.26
+konqi.ilo.openstreetmap:193.63.75.27
-+konqi.internal.openstreetmap:10.0.0.252
+wiki.openstreetmap:193.63.75.26
+dump.wiki.openstreetmap:193.63.75.26
+#+konqi.ic.openstreetmap:10.0.16.1
+#+konqi.oob.openstreetmap:10.0.17.1
+
+# Tile cache server
+
++orm.openstreetmap:193.63.75.98
+#+orm.ic.openstreetmap:10.0.16.2
+#+orm.oob.openstreetmap:10.0.17.2
# Blog aggregator (on Shaun McDonald's VM)
+donate.openstreetmap:89.145.67.86
-# Our shop
-
-Cshop.openstreetmap:virtual.fotopic.net
-
# HOT site
+hot.openstreetmap:69.163.129.108
+
+# Jochen Topf's taginfo service, running on openstreetmap.de hardware
+
++taginfo.openstreetmap:85.214.118.227
+3taginfo.openstreetmap:2a0102384000000003cac7808a7d7be2
projects / dns.git / blobdiff