From d1b72774de56d34f1ebd9ace74b48c51af97fb9d Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 28 Jul 2010 23:38:35 +0000 Subject: [PATCH] Add shenron and move all idris's services to it and make idris a spare machine, along with the old vm. --- data/openstreetmap.com | 41 ++++++++++++++++++++--------------------- data/openstreetmap.net | 41 ++++++++++++++++++++--------------------- data/openstreetmap.org | 41 ++++++++++++++++++++--------------------- data/openstreetmaps.org | 41 ++++++++++++++++++++--------------------- data/osm.org | 41 ++++++++++++++++++++--------------------- data/osmfoundation.org | 2 +- src/openstreetmap | 41 ++++++++++++++++++++--------------------- src/osmfoundation | 2 +- 8 files changed, 122 insertions(+), 128 deletions(-) diff --git a/data/openstreetmap.com b/data/openstreetmap.com index ceb4669..2b72d29 100644 --- a/data/openstreetmap.com +++ b/data/openstreetmap.com @@ -10,14 +10,14 @@ # Make the virtual machine the primary MX with Bytemark as backup -@openstreetmap.com:89.16.177.88:a:10 +@openstreetmap.com:89.16.179.150:a:10 @openstreetmap.com::backup.mx.bytemark.co.uk:20 -@otrs.openstreetmap.com:89.16.177.88:a:10 -@messages.openstreetmap.com:89.16.177.88:a:10 +@otrs.openstreetmap.com:89.16.179.150:a:10 +@messages.openstreetmap.com:89.16.179.150:a:10 # Publish an SPF record indicating that only idris sends mail -'openstreetmap.com:v=spf1 ip4\07289.16.177.88 ~all +'openstreetmap.com:v=spf1 ip4\07289.16.179.150 ~all # Main web servers and their aliases @@ -139,6 +139,11 @@ +dulcy.internal.openstreetmap.com:10.0.0.2 ++idris.openstreetmap.com:89.16.177.88 ++idris.internal.openstreetmap.com:10.0.0.253 + ++vm.openstreetmap.com:80.68.94.95 + # APC power switch +apc1.internal.openstreetmap.com:10.0.0.49 @@ -147,23 +152,17 @@ +forum.openstreetmap.com:93.186.179.231 -# Bytemark virtual machine, and the services which operate from it - -+vm.openstreetmap.com:80.68.94.95 -+stats.wiki.openstreetmap.com:80.68.94.95 -+vm.internal.openstreetmap.com:10.0.0.253 - -# Bytemark atom machine, and the services which operate from it - -+idris.openstreetmap.com:89.16.177.88 -+mail.openstreetmap.com:89.16.177.88 -+lists.openstreetmap.com:89.16.177.88 -+svn.openstreetmap.com:89.16.177.88 -+git.openstreetmap.com:89.16.177.88 -+trac.openstreetmap.com:89.16.177.88 -+irc.openstreetmap.com:89.16.177.88 -+help.openstreetmap.com:89.16.177.88 -+idris.internal.openstreetmap.com:10.0.0.253 +# Bytemark machine, and the services which operate from it + ++shenron.openstreetmap.com:89.16.179.150 ++mail.openstreetmap.com:89.16.179.150 ++lists.openstreetmap.com:89.16.179.150 ++svn.openstreetmap.com:89.16.179.150 ++git.openstreetmap.com:89.16.179.150 ++trac.openstreetmap.com:89.16.179.150 ++irc.openstreetmap.com:89.16.179.150 ++help.openstreetmap.com:89.16.179.150 ++shenron.internal.openstreetmap.com:10.0.0.251 # Wiki server diff --git a/data/openstreetmap.net b/data/openstreetmap.net index 4aeca4a..d139ec0 100644 --- a/data/openstreetmap.net +++ b/data/openstreetmap.net @@ -10,14 +10,14 @@ # Make the virtual machine the primary MX with Bytemark as backup -@openstreetmap.net:89.16.177.88:a:10 +@openstreetmap.net:89.16.179.150:a:10 @openstreetmap.net::backup.mx.bytemark.co.uk:20 -@otrs.openstreetmap.net:89.16.177.88:a:10 -@messages.openstreetmap.net:89.16.177.88:a:10 +@otrs.openstreetmap.net:89.16.179.150:a:10 +@messages.openstreetmap.net:89.16.179.150:a:10 # Publish an SPF record indicating that only idris sends mail -'openstreetmap.net:v=spf1 ip4\07289.16.177.88 ~all +'openstreetmap.net:v=spf1 ip4\07289.16.179.150 ~all # Main web servers and their aliases @@ -139,6 +139,11 @@ +dulcy.internal.openstreetmap.net:10.0.0.2 ++idris.openstreetmap.net:89.16.177.88 ++idris.internal.openstreetmap.net:10.0.0.253 + ++vm.openstreetmap.net:80.68.94.95 + # APC power switch +apc1.internal.openstreetmap.net:10.0.0.49 @@ -147,23 +152,17 @@ +forum.openstreetmap.net:93.186.179.231 -# Bytemark virtual machine, and the services which operate from it - -+vm.openstreetmap.net:80.68.94.95 -+stats.wiki.openstreetmap.net:80.68.94.95 -+vm.internal.openstreetmap.net:10.0.0.253 - -# Bytemark atom machine, and the services which operate from it - -+idris.openstreetmap.net:89.16.177.88 -+mail.openstreetmap.net:89.16.177.88 -+lists.openstreetmap.net:89.16.177.88 -+svn.openstreetmap.net:89.16.177.88 -+git.openstreetmap.net:89.16.177.88 -+trac.openstreetmap.net:89.16.177.88 -+irc.openstreetmap.net:89.16.177.88 -+help.openstreetmap.net:89.16.177.88 -+idris.internal.openstreetmap.net:10.0.0.253 +# Bytemark machine, and the services which operate from it + ++shenron.openstreetmap.net:89.16.179.150 ++mail.openstreetmap.net:89.16.179.150 ++lists.openstreetmap.net:89.16.179.150 ++svn.openstreetmap.net:89.16.179.150 ++git.openstreetmap.net:89.16.179.150 ++trac.openstreetmap.net:89.16.179.150 ++irc.openstreetmap.net:89.16.179.150 ++help.openstreetmap.net:89.16.179.150 ++shenron.internal.openstreetmap.net:10.0.0.251 # Wiki server diff --git a/data/openstreetmap.org b/data/openstreetmap.org index 3d36e89..4d4d081 100644 --- a/data/openstreetmap.org +++ b/data/openstreetmap.org @@ -10,14 +10,14 @@ # Make the virtual machine the primary MX with Bytemark as backup -@openstreetmap.org:89.16.177.88:a:10 +@openstreetmap.org:89.16.179.150:a:10 @openstreetmap.org::backup.mx.bytemark.co.uk:20 -@otrs.openstreetmap.org:89.16.177.88:a:10 -@messages.openstreetmap.org:89.16.177.88:a:10 +@otrs.openstreetmap.org:89.16.179.150:a:10 +@messages.openstreetmap.org:89.16.179.150:a:10 # Publish an SPF record indicating that only idris sends mail -'openstreetmap.org:v=spf1 ip4\07289.16.177.88 ~all +'openstreetmap.org:v=spf1 ip4\07289.16.179.150 ~all # Main web servers and their aliases @@ -139,6 +139,11 @@ +dulcy.internal.openstreetmap.org:10.0.0.2 ++idris.openstreetmap.org:89.16.177.88 ++idris.internal.openstreetmap.org:10.0.0.253 + ++vm.openstreetmap.org:80.68.94.95 + # APC power switch +apc1.internal.openstreetmap.org:10.0.0.49 @@ -147,23 +152,17 @@ +forum.openstreetmap.org:93.186.179.231 -# Bytemark virtual machine, and the services which operate from it - -+vm.openstreetmap.org:80.68.94.95 -+stats.wiki.openstreetmap.org:80.68.94.95 -+vm.internal.openstreetmap.org:10.0.0.253 - -# Bytemark atom machine, and the services which operate from it - -+idris.openstreetmap.org:89.16.177.88 -+mail.openstreetmap.org:89.16.177.88 -+lists.openstreetmap.org:89.16.177.88 -+svn.openstreetmap.org:89.16.177.88 -+git.openstreetmap.org:89.16.177.88 -+trac.openstreetmap.org:89.16.177.88 -+irc.openstreetmap.org:89.16.177.88 -+help.openstreetmap.org:89.16.177.88 -+idris.internal.openstreetmap.org:10.0.0.253 +# Bytemark machine, and the services which operate from it + ++shenron.openstreetmap.org:89.16.179.150 ++mail.openstreetmap.org:89.16.179.150 ++lists.openstreetmap.org:89.16.179.150 ++svn.openstreetmap.org:89.16.179.150 ++git.openstreetmap.org:89.16.179.150 ++trac.openstreetmap.org:89.16.179.150 ++irc.openstreetmap.org:89.16.179.150 ++help.openstreetmap.org:89.16.179.150 ++shenron.internal.openstreetmap.org:10.0.0.251 # Wiki server diff --git a/data/openstreetmaps.org b/data/openstreetmaps.org index e2eda80..2b4abcc 100644 --- a/data/openstreetmaps.org +++ b/data/openstreetmaps.org @@ -10,14 +10,14 @@ # 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 -'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 @@ -139,6 +139,11 @@ +dulcy.internal.openstreetmaps.org:10.0.0.2 ++idris.openstreetmaps.org:89.16.177.88 ++idris.internal.openstreetmaps.org:10.0.0.253 + ++vm.openstreetmaps.org:80.68.94.95 + # APC power switch +apc1.internal.openstreetmaps.org:10.0.0.49 @@ -147,23 +152,17 @@ +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 # Wiki server diff --git a/data/osm.org b/data/osm.org index c1b4697..a8b925b 100644 --- a/data/osm.org +++ b/data/osm.org @@ -10,14 +10,14 @@ # 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:89.16.179.150:a:10 +@messages.osm.org:89.16.179.150:a:10 # Publish an SPF record indicating that only idris sends mail -'osm.org:v=spf1 ip4\07289.16.177.88 ~all +'osm.org:v=spf1 ip4\07289.16.179.150 ~all # Main web servers and their aliases @@ -139,6 +139,11 @@ +dulcy.internal.osm.org:10.0.0.2 ++idris.osm.org:89.16.177.88 ++idris.internal.osm.org:10.0.0.253 + ++vm.osm.org:80.68.94.95 + # APC power switch +apc1.internal.osm.org:10.0.0.49 @@ -147,23 +152,17 @@ +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 ++shenron.internal.osm.org:10.0.0.251 # Wiki server diff --git a/data/osmfoundation.org b/data/osmfoundation.org index b36766d..d3060b5 100644 --- a/data/osmfoundation.org +++ b/data/osmfoundation.org @@ -10,7 +10,7 @@ # SPF Record -'osmfoundation.org:v=spf1 a\072idris.openstreetmap.org include\072aspmx.googlemail.com ~all:3600 +'osmfoundation.org:v=spf1 a\072shenron.openstreetmap.org include\072aspmx.googlemail.com ~all:3600 # Let google handle email diff --git a/src/openstreetmap b/src/openstreetmap index 8d4a1c0..8cb3376 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -10,14 +10,14 @@ # 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 -'openstreetmap:v=spf1 ip4\07289.16.177.88 ~all +'openstreetmap:v=spf1 ip4\07289.16.179.150 ~all # Main web servers and their aliases @@ -139,6 +139,11 @@ +dulcy.internal.openstreetmap:10.0.0.2 ++idris.openstreetmap:89.16.177.88 ++idris.internal.openstreetmap:10.0.0.253 + ++vm.openstreetmap:80.68.94.95 + # APC power switch +apc1.internal.openstreetmap:10.0.0.49 @@ -147,23 +152,17 @@ +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 diff --git a/src/osmfoundation b/src/osmfoundation index 876eea4..a8202e7 100644 --- a/src/osmfoundation +++ b/src/osmfoundation @@ -10,7 +10,7 @@ # SPF Record -'osmfoundation:v=spf1 a\072idris.openstreetmap.org include\072aspmx.googlemail.com ~all:3600 +'osmfoundation:v=spf1 a\072shenron.openstreetmap.org include\072aspmx.googlemail.com ~all:3600 # Let google handle email -- 2.43.2