Add shenron and move all idris's services to it and make idris a

spare machine, along with the old vm.

diff --git a/data/openstreetmap.com b/data/openstreetmap.com
index ceb4669080c9221ccf40c1938f4ef552492b2b34..2b72d29b93c12e4134c74ca05c52283257da8ce2 100644 (file)
--- 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 4aeca4a159d17fd05409249bc2bd654670837dd5..d139ec05bc606a083bae8a9e35614b73b6139a94 100644 (file)
--- 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 3d36e898f27616e4732d888121047ecc40851885..4d4d081b0492879776f82e03bd15b26996150ca0 100644 (file)
--- 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 e2eda80ab71ce16073e1d28b0419f08c055fb488..2b4abcc25fcff2ef3d53320519c883cc79b9664a 100644 (file)
--- 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 c1b469730c4bc2eb1b1beb40c5aaf90c70cd1f85..a8b925bc19a04ba08ee7dc16d474499b7c9faee6 100644 (file)
--- 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 b36766d5164203a2d5e8d64dc9eb8789daae0c5f..d3060b55d99f95cd0b4327977e4eb6909564dd0c 100644 (file)
--- 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 8d4a1c063d2a64c23f5f8bcabd93934110e08acd..8cb33763c603f59a76c256cbf7661a49abd97343 100644 (file)
--- 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 876eea4b29c00c4fa46924937fd73b7b2b794d36..a8202e7a4b4c7fd151fbc180d914c4816d58c29a 100644 (file)
--- 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