# 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:89.16.179.150:a:10
+@messages.openstreetmap: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
-'openstreetmap:v=spf1 ip4\07289.16.177.88 ~all
+'openstreetmap:v=spf1 ip4\07289.16.179.150 ~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
-+www.openstreetmap:128.40.168.105
-+api.openstreetmap:128.40.168.105
-+maps.openstreetmap:128.40.168.105
-+mapz.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
+xapi.openstreetmap:128.40.168.97
+fafnir.internal.openstreetmap:10.0.0.4
+# OWL server
+
++albi.openstreetmap.org:128.40.168.95
++owl.openstreetmap.org:128.40.168.95
++albi.internal.openstreetmap.org:10.0.0.2
+
# 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: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
# 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
# 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
++shenron.internal.openstreetmap:10.0.0.251
# Wiki server
projects / dns.git / blobdiff