From a040c5b6c12a41ee12d77a564b8d46f39d46c858 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Wed, 28 Jul 2010 08:57:55 +0000 Subject: [PATCH] We are now using fuchur to serve the web site as well as puff. --- data/openstreetmap.com | 14 ++++++++++---- data/openstreetmap.net | 14 ++++++++++---- data/openstreetmap.org | 14 ++++++++++---- data/openstreetmaps.org | 14 ++++++++++---- data/osm.org | 14 ++++++++++---- src/openstreetmap | 14 ++++++++++---- 6 files changed, 60 insertions(+), 24 deletions(-) diff --git a/data/openstreetmap.com b/data/openstreetmap.com index 275eeee..b385eec 100644 --- a/data/openstreetmap.com +++ b/data/openstreetmap.com @@ -19,7 +19,7 @@ 'openstreetmap.com:v=spf1 ip4\07289.16.177.88 ~all -# Main web server and it's aliases +# Main web servers and their aliases +puff.openstreetmap.com:128.40.168.98 +openstreetmap.com:128.40.168.98 @@ -30,6 +30,15 @@ +puff.internal.openstreetmap.com:10.0.0.8 +puff.ilo.openstreetmap.com:10.0.0.58 ++fuchur.openstreetmap.com:128.40.168.105 ++openstreetmap.com:128.40.168.105 ++www.openstreetmap.com:128.40.168.105 ++api.openstreetmap.com:128.40.168.105 ++maps.openstreetmap.com:128.40.168.105 ++mapz.openstreetmap.com:128.40.168.105 ++fuchur.internal.openstreetmap.com:10.0.0.9 ++fuchur.ilo.openstreetmap.com:10.0.0.59 + # Rails application servers +draco.internal.openstreetmap.com:10.0.0.10 @@ -128,9 +137,6 @@ # Spare servers -+fuchur.openstreetmap.com:128.40.168.105 -+fuchur.internal.openstreetmap.com:10.0.0.9 -+fuchur.ilo.openstreetmap.com:10.0.0.59 +dulcy.internal.openstreetmap.com:10.0.0.2 # APC power switch diff --git a/data/openstreetmap.net b/data/openstreetmap.net index 9aad93e..7147f99 100644 --- a/data/openstreetmap.net +++ b/data/openstreetmap.net @@ -19,7 +19,7 @@ 'openstreetmap.net:v=spf1 ip4\07289.16.177.88 ~all -# Main web server and it's aliases +# Main web servers and their aliases +puff.openstreetmap.net:128.40.168.98 +openstreetmap.net:128.40.168.98 @@ -30,6 +30,15 @@ +puff.internal.openstreetmap.net:10.0.0.8 +puff.ilo.openstreetmap.net:10.0.0.58 ++fuchur.openstreetmap.net:128.40.168.105 ++openstreetmap.net:128.40.168.105 ++www.openstreetmap.net:128.40.168.105 ++api.openstreetmap.net:128.40.168.105 ++maps.openstreetmap.net:128.40.168.105 ++mapz.openstreetmap.net:128.40.168.105 ++fuchur.internal.openstreetmap.net:10.0.0.9 ++fuchur.ilo.openstreetmap.net:10.0.0.59 + # Rails application servers +draco.internal.openstreetmap.net:10.0.0.10 @@ -128,9 +137,6 @@ # Spare servers -+fuchur.openstreetmap.net:128.40.168.105 -+fuchur.internal.openstreetmap.net:10.0.0.9 -+fuchur.ilo.openstreetmap.net:10.0.0.59 +dulcy.internal.openstreetmap.net:10.0.0.2 # APC power switch diff --git a/data/openstreetmap.org b/data/openstreetmap.org index e7559e6..f8938a3 100644 --- a/data/openstreetmap.org +++ b/data/openstreetmap.org @@ -19,7 +19,7 @@ 'openstreetmap.org:v=spf1 ip4\07289.16.177.88 ~all -# Main web server and it's aliases +# Main web servers and their aliases +puff.openstreetmap.org:128.40.168.98 +openstreetmap.org:128.40.168.98 @@ -30,6 +30,15 @@ +puff.internal.openstreetmap.org:10.0.0.8 +puff.ilo.openstreetmap.org:10.0.0.58 ++fuchur.openstreetmap.org:128.40.168.105 ++openstreetmap.org:128.40.168.105 ++www.openstreetmap.org:128.40.168.105 ++api.openstreetmap.org:128.40.168.105 ++maps.openstreetmap.org:128.40.168.105 ++mapz.openstreetmap.org:128.40.168.105 ++fuchur.internal.openstreetmap.org:10.0.0.9 ++fuchur.ilo.openstreetmap.org:10.0.0.59 + # Rails application servers +draco.internal.openstreetmap.org:10.0.0.10 @@ -128,9 +137,6 @@ # Spare servers -+fuchur.openstreetmap.org:128.40.168.105 -+fuchur.internal.openstreetmap.org:10.0.0.9 -+fuchur.ilo.openstreetmap.org:10.0.0.59 +dulcy.internal.openstreetmap.org:10.0.0.2 # APC power switch diff --git a/data/openstreetmaps.org b/data/openstreetmaps.org index 6f5204a..c747d3d 100644 --- a/data/openstreetmaps.org +++ b/data/openstreetmaps.org @@ -19,7 +19,7 @@ 'openstreetmaps.org:v=spf1 ip4\07289.16.177.88 ~all -# Main web server and it's aliases +# Main web servers and their aliases +puff.openstreetmaps.org:128.40.168.98 +openstreetmaps.org:128.40.168.98 @@ -30,6 +30,15 @@ +puff.internal.openstreetmaps.org:10.0.0.8 +puff.ilo.openstreetmaps.org:10.0.0.58 ++fuchur.openstreetmaps.org:128.40.168.105 ++openstreetmaps.org:128.40.168.105 ++www.openstreetmaps.org:128.40.168.105 ++api.openstreetmaps.org:128.40.168.105 ++maps.openstreetmaps.org:128.40.168.105 ++mapz.openstreetmaps.org:128.40.168.105 ++fuchur.internal.openstreetmaps.org:10.0.0.9 ++fuchur.ilo.openstreetmaps.org:10.0.0.59 + # Rails application servers +draco.internal.openstreetmaps.org:10.0.0.10 @@ -128,9 +137,6 @@ # Spare servers -+fuchur.openstreetmaps.org:128.40.168.105 -+fuchur.internal.openstreetmaps.org:10.0.0.9 -+fuchur.ilo.openstreetmaps.org:10.0.0.59 +dulcy.internal.openstreetmaps.org:10.0.0.2 # APC power switch diff --git a/data/osm.org b/data/osm.org index 1cbbc08..8ef2449 100644 --- a/data/osm.org +++ b/data/osm.org @@ -19,7 +19,7 @@ 'osm.org:v=spf1 ip4\07289.16.177.88 ~all -# Main web server and it's aliases +# Main web servers and their aliases +puff.osm.org:128.40.168.98 +osm.org:128.40.168.98 @@ -30,6 +30,15 @@ +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 ++www.osm.org:128.40.168.105 ++api.osm.org:128.40.168.105 ++maps.osm.org:128.40.168.105 ++mapz.osm.org:128.40.168.105 ++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 @@ -128,9 +137,6 @@ # 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 diff --git a/src/openstreetmap b/src/openstreetmap index 02d3ce1..caacf01 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -19,7 +19,7 @@ 'openstreetmap:v=spf1 ip4\07289.16.177.88 ~all -# Main web server and it's aliases +# Main web servers and their aliases +puff.openstreetmap:128.40.168.98 +openstreetmap:128.40.168.98 @@ -30,6 +30,15 @@ +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 ++fuchur.internal.openstreetmap:10.0.0.9 ++fuchur.ilo.openstreetmap:10.0.0.59 + # Rails application servers +draco.internal.openstreetmap:10.0.0.10 @@ -128,9 +137,6 @@ # Spare servers -+fuchur.openstreetmap:128.40.168.105 -+fuchur.internal.openstreetmap:10.0.0.9 -+fuchur.ilo.openstreetmap:10.0.0.59 +dulcy.internal.openstreetmap:10.0.0.2 # APC power switch -- 2.43.2