# Make the virtual machine the primary MX with Bytemark as backup
-@osm.org:89.16.177.88:a:10
+@osm.org:89.16.179.150:a:10
@osm.org::backup.mx.bytemark.co.uk:20
-@otrs.osm.org:89.16.177.88:a:10
-@messages.osm.org:89.16.177.88:a:10
+@otrs.osm.org::a.mx.osm.org:10
+@messages.osm.org::a.mx.osm.org:10
-# Publish an SPF record indicating that only idris sends mail
+3a.mx.osm.org:200141c800100996021d7dfffec3df70
-'osm.org: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
+'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
+puff.osm.org:128.40.168.98
-+osm.org:128.40.168.98
-+www.osm.org:128.40.168.98
-+api.osm.org:128.40.168.98
-+maps.osm.org:128.40.168.98
-+mapz.osm.org:128.40.168.98
++osm.org:128.40.168.98:3600
++www.osm.org:128.40.168.98:3600
++api.osm.org:128.40.168.98:3600
++maps.osm.org:128.40.168.98:3600
++mapz.osm.org:128.40.168.98:3600
+puff.internal.osm.org:10.0.0.8
+puff.ilo.osm.org:10.0.0.58
++fuchur.osm.org:128.40.168.105
++osm.org:128.40.168.105:3600
++www.osm.org:128.40.168.105:3600
++api.osm.org:128.40.168.105:3600
++maps.osm.org:128.40.168.105:3600
++mapz.osm.org:128.40.168.105:3600
++fuchur.internal.osm.org:10.0.0.9
++fuchur.ilo.osm.org:10.0.0.59
+
# Rails application servers
+draco.internal.osm.org:10.0.0.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
+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
++jxapi.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
-+tile.osm.org:128.40.168.104
-+a.tile.osm.org:128.40.168.104
-+b.tile.osm.org:128.40.168.104
-+c.tile.osm.org:128.40.168.104
++tile.osm.org:128.40.168.104:3600
++a.tile.osm.org:128.40.168.104:3600
++b.tile.osm.org:128.40.168.104:3600
++c.tile.osm.org:128.40.168.104:3600
+yevaud.internal.osm.org:10.0.0.15
+yevaud.ilo.osm.org:10.0.0.65
+horntail.osm.org:128.40.168.99
+munin.osm.org:128.40.168.99
++apt.osm.org:128.40.168.99
++stats.osm.org:128.40.168.99
++chef.osm.org:128.40.168.99
+backup.osm.org:10.0.0.7
+horntail.internal.osm.org:10.0.0.7
+horntail.ilo.osm.org:10.1.0.7
# Development server with wildcard alias for user sites
-+old-dev.osm.org:128.40.168.100
-+*.old-dev.osm.org:128.40.168.100
-+old-dev.internal.osm.org:10.0.0.5
-
+errol.osm.org:128.40.168.103
+dev.osm.org:128.40.168.103
+*.dev.osm.org:128.40.168.103
+planet.osm.org:128.40.168.99
-# Spare servers
-
-+fuchur.osm.org:128.40.168.105
-+fuchur.internal.osm.org:10.0.0.9
-+fuchur.ilo.osm.org:10.0.0.59
-+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
+forum.osm.org:93.186.179.231
-# Bytemark virtual machine, and the services which operate from it
-
-+vm.osm.org:80.68.94.95
-+stats.wiki.osm.org:80.68.94.95
-+vm.internal.osm.org:10.0.0.253
-
-# Bytemark atom machine, and the services which operate from it
-
-+idris.osm.org:89.16.177.88
-+mail.osm.org:89.16.177.88
-+lists.osm.org:89.16.177.88
-+svn.osm.org:89.16.177.88
-+git.osm.org:89.16.177.88
-+trac.osm.org:89.16.177.88
-+irc.osm.org:89.16.177.88
-+help.osm.org:89.16.177.88
-+idris.internal.osm.org:10.0.0.253
+# Bytemark machine, and the services which operate from it
+
++shenron.osm.org:89.16.179.150
++mail.osm.org:89.16.179.150
++lists.osm.org:89.16.179.150
++svn.osm.org:89.16.179.150
++git.osm.org:89.16.179.150
++trac.osm.org:89.16.179.150
++irc.osm.org:89.16.179.150
++help.osm.org:89.16.179.150
++shop.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
+3shop.osm.org:200141c800100996021d7dfffec3df70
# Wiki server
+wiki.osm.org:193.63.75.26
+dump.wiki.osm.org:193.63.75.26
+# Tile cache server
+
++orm.osm.org:193.63.75.98
+
# Blog aggregator (on Shaun McDonald's VM)
+blogs.osm.org:89.16.175.12
+donate.osm.org:89.145.67.86
-# Our shop
-
-Cshop.osm.org:virtual.fotopic.net
-
# HOT site
+hot.osm.org:69.163.129.108
projects / dns.git / blobdiff