We are now using fuchur to serve the web site as well as puff.

diff --git a/data/openstreetmap.com b/data/openstreetmap.com
index 275eeee764992fc2e81a79a0435a7d4a6afbdc55..b385eec4765453680e58c1aaa92999d6d80e6639 100644 (file)
--- 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 9aad93e712abd0ffd695af2609ea04b6564078f7..7147f999760e9346c7209837ef982668f2ce9f2f 100644 (file)
--- 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 e7559e64dfc84504f4b5d42f34336c11ddc5d763..f8938a3b9f92854db7b346779c07abf94ebe779d 100644 (file)
--- 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 6f5204a4e90ca846e86766eacf71eb75f575b142..c747d3d31e6fe3a8b4db04bbcf59280a90b15f0a 100644 (file)
--- 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 1cbbc08d8458a2d7570739ee9cce3ba5eb8e81a2..8ef244963db989ac9050c808a2eec263805486e3 100644 (file)
--- 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 02d3ce1cd4147bee080787af7243ef2e84279d8e..caacf012625d4da7893f3478f50d419cd260b31c 100644 (file)
--- 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