Reduce DNS TTLs on konqi in case it needs to change address

diff --git a/data/openstreetmap.com b/data/openstreetmap.com
index 300d839a056089f2bb890909f275b1cb80308b4f..8fb5926c99e3f869d97d000a81dc44a1ba55521c 100644 (file)
--- a/data/openstreetmap.com
+++ b/data/openstreetmap.com
@@ -24,20 +24,20 @@
 # Main web servers and their aliases
 
 +puff.openstreetmap.com:193.63.75.99
-#+openstreetmap.com:193.63.75.101:600
-#+www.openstreetmap.com:193.63.75.99:600
-#+api.openstreetmap.com:193.63.75.99:600
-#+maps.openstreetmap.com:193.63.75.99:600
-#+mapz.openstreetmap.com:193.63.75.99:600
++openstreetmap.com:193.63.75.99:600
++www.openstreetmap.com:193.63.75.99:600
++api.openstreetmap.com:193.63.75.99:600
++maps.openstreetmap.com:193.63.75.99:600
++mapz.openstreetmap.com:193.63.75.99:600
 +puff.ic.openstreetmap.com:146.179.159.162
 +puff.oob.openstreetmap.com:146.179.159.188
 
 +fuchur.openstreetmap.com:128.40.168.105:600
-+openstreetmap.com:128.40.168.105:600
-+www.openstreetmap.com:128.40.168.105:600
-+api.openstreetmap.com:128.40.168.105:600
-+maps.openstreetmap.com:128.40.168.105:600
-+mapz.openstreetmap.com:128.40.168.105:600
+#+openstreetmap.com:128.40.168.105:600
+#+www.openstreetmap.com:128.40.168.105:600
+#+api.openstreetmap.com:128.40.168.105:600
+#+maps.openstreetmap.com:128.40.168.105:600
+#+mapz.openstreetmap.com:128.40.168.105:600
 +fuchur.ucl.openstreetmap.com:10.0.0.9
 +fuchur.oob.openstreetmap.com:10.0.1.9:600
 
@@ -90,10 +90,10 @@
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmap.com:128.40.168.104
-+tile.openstreetmap.com:193.63.75.26:1800
-+a.tile.openstreetmap.com:193.63.75.26:900
-+b.tile.openstreetmap.com:128.40.168.95:900
-+c.tile.openstreetmap.com:128.40.168.95:900
++tile.openstreetmap.com:193.63.75.26:600
++a.tile.openstreetmap.com:193.63.75.26:600
++b.tile.openstreetmap.com:128.40.168.95:600
++c.tile.openstreetmap.com:128.40.168.95:600
 +yevaud.ucl.openstreetmap.com:10.0.0.15
 +yevaud.oob.openstreetmap.com:10.0.1.15
 
@@ -152,12 +152,17 @@
 +foundation.openstreetmap.com:128.40.168.102
 +ridley.ucl.openstreetmap.com:10.0.0.3
 
-# APC power switch
+# APC power switches
 
 +apc1.ucl.openstreetmap.com:10.0.0.49
 +apc2.ucl.openstreetmap.com:10.0.0.50
 +apc3.ucl.openstreetmap.com:10.0.0.51
 
+# Managed network switches
+
++switch1.openstreetmap.com:193.63.75.102
++switch2.ic.openstreetmap.com:146.179.159.169
+
 # Forum server
 
 +forum.openstreetmap.com:93.186.179.231
@@ -186,10 +191,10 @@
 
 # Wiki server
 
-+konqi.openstreetmap.com:193.63.75.26
-+konqi.ilo.openstreetmap.com:193.63.75.27
-+wiki.openstreetmap.com:193.63.75.26
-+dump.wiki.openstreetmap.com:193.63.75.26
++konqi.openstreetmap.com:193.63.75.26:600
++konqi.ilo.openstreetmap.com:193.63.75.27:600
++wiki.openstreetmap.com:193.63.75.26:600
++dump.wiki.openstreetmap.com:193.63.75.26:600
 #+konqi.ic.openstreetmap.com:10.0.16.1
 #+konqi.oob.openstreetmap.com:10.0.17.1
 

diff --git a/data/openstreetmap.net b/data/openstreetmap.net
index cf0024b1809240c6905f7c766af12562c2f14c9b..680cc3797cb678ebf171f454e80f4a75a9e3f52d 100644 (file)
--- a/data/openstreetmap.net
+++ b/data/openstreetmap.net
@@ -24,20 +24,20 @@
 # Main web servers and their aliases
 
 +puff.openstreetmap.net:193.63.75.99
-#+openstreetmap.net:193.63.75.101:600
-#+www.openstreetmap.net:193.63.75.99:600
-#+api.openstreetmap.net:193.63.75.99:600
-#+maps.openstreetmap.net:193.63.75.99:600
-#+mapz.openstreetmap.net:193.63.75.99:600
++openstreetmap.net:193.63.75.99:600
++www.openstreetmap.net:193.63.75.99:600
++api.openstreetmap.net:193.63.75.99:600
++maps.openstreetmap.net:193.63.75.99:600
++mapz.openstreetmap.net:193.63.75.99:600
 +puff.ic.openstreetmap.net:146.179.159.162
 +puff.oob.openstreetmap.net:146.179.159.188
 
 +fuchur.openstreetmap.net:128.40.168.105:600
-+openstreetmap.net:128.40.168.105:600
-+www.openstreetmap.net:128.40.168.105:600
-+api.openstreetmap.net:128.40.168.105:600
-+maps.openstreetmap.net:128.40.168.105:600
-+mapz.openstreetmap.net:128.40.168.105:600
+#+openstreetmap.net:128.40.168.105:600
+#+www.openstreetmap.net:128.40.168.105:600
+#+api.openstreetmap.net:128.40.168.105:600
+#+maps.openstreetmap.net:128.40.168.105:600
+#+mapz.openstreetmap.net:128.40.168.105:600
 +fuchur.ucl.openstreetmap.net:10.0.0.9
 +fuchur.oob.openstreetmap.net:10.0.1.9:600
 
@@ -90,10 +90,10 @@
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmap.net:128.40.168.104
-+tile.openstreetmap.net:193.63.75.26:1800
-+a.tile.openstreetmap.net:193.63.75.26:900
-+b.tile.openstreetmap.net:128.40.168.95:900
-+c.tile.openstreetmap.net:128.40.168.95:900
++tile.openstreetmap.net:193.63.75.26:600
++a.tile.openstreetmap.net:193.63.75.26:600
++b.tile.openstreetmap.net:128.40.168.95:600
++c.tile.openstreetmap.net:128.40.168.95:600
 +yevaud.ucl.openstreetmap.net:10.0.0.15
 +yevaud.oob.openstreetmap.net:10.0.1.15
 
@@ -152,12 +152,17 @@
 +foundation.openstreetmap.net:128.40.168.102
 +ridley.ucl.openstreetmap.net:10.0.0.3
 
-# APC power switch
+# APC power switches
 
 +apc1.ucl.openstreetmap.net:10.0.0.49
 +apc2.ucl.openstreetmap.net:10.0.0.50
 +apc3.ucl.openstreetmap.net:10.0.0.51
 
+# Managed network switches
+
++switch1.openstreetmap.net:193.63.75.102
++switch2.ic.openstreetmap.net:146.179.159.169
+
 # Forum server
 
 +forum.openstreetmap.net:93.186.179.231
@@ -186,10 +191,10 @@
 
 # Wiki server
 
-+konqi.openstreetmap.net:193.63.75.26
-+konqi.ilo.openstreetmap.net:193.63.75.27
-+wiki.openstreetmap.net:193.63.75.26
-+dump.wiki.openstreetmap.net:193.63.75.26
++konqi.openstreetmap.net:193.63.75.26:600
++konqi.ilo.openstreetmap.net:193.63.75.27:600
++wiki.openstreetmap.net:193.63.75.26:600
++dump.wiki.openstreetmap.net:193.63.75.26:600
 #+konqi.ic.openstreetmap.net:10.0.16.1
 #+konqi.oob.openstreetmap.net:10.0.17.1
 

diff --git a/data/openstreetmap.org b/data/openstreetmap.org
index cf1cccf98ce6dcd027f44245067b3d6f082b32e5..a9c11ca86f181b0488437eeec707b60c11ace779 100644 (file)
--- a/data/openstreetmap.org
+++ b/data/openstreetmap.org
@@ -24,20 +24,20 @@
 # Main web servers and their aliases
 
 +puff.openstreetmap.org:193.63.75.99
-#+openstreetmap.org:193.63.75.101:600
-#+www.openstreetmap.org:193.63.75.99:600
-#+api.openstreetmap.org:193.63.75.99:600
-#+maps.openstreetmap.org:193.63.75.99:600
-#+mapz.openstreetmap.org:193.63.75.99:600
++openstreetmap.org:193.63.75.99:600
++www.openstreetmap.org:193.63.75.99:600
++api.openstreetmap.org:193.63.75.99:600
++maps.openstreetmap.org:193.63.75.99:600
++mapz.openstreetmap.org:193.63.75.99:600
 +puff.ic.openstreetmap.org:146.179.159.162
 +puff.oob.openstreetmap.org:146.179.159.188
 
 +fuchur.openstreetmap.org:128.40.168.105:600
-+openstreetmap.org:128.40.168.105:600
-+www.openstreetmap.org:128.40.168.105:600
-+api.openstreetmap.org:128.40.168.105:600
-+maps.openstreetmap.org:128.40.168.105:600
-+mapz.openstreetmap.org:128.40.168.105:600
+#+openstreetmap.org:128.40.168.105:600
+#+www.openstreetmap.org:128.40.168.105:600
+#+api.openstreetmap.org:128.40.168.105:600
+#+maps.openstreetmap.org:128.40.168.105:600
+#+mapz.openstreetmap.org:128.40.168.105:600
 +fuchur.ucl.openstreetmap.org:10.0.0.9
 +fuchur.oob.openstreetmap.org:10.0.1.9:600
 
@@ -90,10 +90,10 @@
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmap.org:128.40.168.104
-+tile.openstreetmap.org:193.63.75.26:1800
-+a.tile.openstreetmap.org:193.63.75.26:900
-+b.tile.openstreetmap.org:128.40.168.95:900
-+c.tile.openstreetmap.org:128.40.168.95:900
++tile.openstreetmap.org:193.63.75.26:600
++a.tile.openstreetmap.org:193.63.75.26:600
++b.tile.openstreetmap.org:128.40.168.95:600
++c.tile.openstreetmap.org:128.40.168.95:600
 +yevaud.ucl.openstreetmap.org:10.0.0.15
 +yevaud.oob.openstreetmap.org:10.0.1.15
 
@@ -152,12 +152,17 @@
 +foundation.openstreetmap.org:128.40.168.102
 +ridley.ucl.openstreetmap.org:10.0.0.3
 
-# APC power switch
+# APC power switches
 
 +apc1.ucl.openstreetmap.org:10.0.0.49
 +apc2.ucl.openstreetmap.org:10.0.0.50
 +apc3.ucl.openstreetmap.org:10.0.0.51
 
+# Managed network switches
+
++switch1.openstreetmap.org:193.63.75.102
++switch2.ic.openstreetmap.org:146.179.159.169
+
 # Forum server
 
 +forum.openstreetmap.org:93.186.179.231
@@ -186,10 +191,10 @@
 
 # Wiki server
 
-+konqi.openstreetmap.org:193.63.75.26
-+konqi.ilo.openstreetmap.org:193.63.75.27
-+wiki.openstreetmap.org:193.63.75.26
-+dump.wiki.openstreetmap.org:193.63.75.26
++konqi.openstreetmap.org:193.63.75.26:600
++konqi.ilo.openstreetmap.org:193.63.75.27:600
++wiki.openstreetmap.org:193.63.75.26:600
++dump.wiki.openstreetmap.org:193.63.75.26:600
 #+konqi.ic.openstreetmap.org:10.0.16.1
 #+konqi.oob.openstreetmap.org:10.0.17.1
 

diff --git a/data/openstreetmaps.org b/data/openstreetmaps.org
index 51432bf74ab0c1332af44774cf79380b6f9c4036..fb8825ed74947d4d569cf86009df788000fa826b 100644 (file)
--- a/data/openstreetmaps.org
+++ b/data/openstreetmaps.org
@@ -24,20 +24,20 @@
 # Main web servers and their aliases
 
 +puff.openstreetmaps.org:193.63.75.99
-#+openstreetmaps.org:193.63.75.101:600
-#+www.openstreetmaps.org:193.63.75.99:600
-#+api.openstreetmaps.org:193.63.75.99:600
-#+maps.openstreetmaps.org:193.63.75.99:600
-#+mapz.openstreetmaps.org:193.63.75.99:600
++openstreetmaps.org:193.63.75.99:600
++www.openstreetmaps.org:193.63.75.99:600
++api.openstreetmaps.org:193.63.75.99:600
++maps.openstreetmaps.org:193.63.75.99:600
++mapz.openstreetmaps.org:193.63.75.99:600
 +puff.ic.openstreetmaps.org:146.179.159.162
 +puff.oob.openstreetmaps.org:146.179.159.188
 
 +fuchur.openstreetmaps.org:128.40.168.105:600
-+openstreetmaps.org:128.40.168.105:600
-+www.openstreetmaps.org:128.40.168.105:600
-+api.openstreetmaps.org:128.40.168.105:600
-+maps.openstreetmaps.org:128.40.168.105:600
-+mapz.openstreetmaps.org:128.40.168.105:600
+#+openstreetmaps.org:128.40.168.105:600
+#+www.openstreetmaps.org:128.40.168.105:600
+#+api.openstreetmaps.org:128.40.168.105:600
+#+maps.openstreetmaps.org:128.40.168.105:600
+#+mapz.openstreetmaps.org:128.40.168.105:600
 +fuchur.ucl.openstreetmaps.org:10.0.0.9
 +fuchur.oob.openstreetmaps.org:10.0.1.9:600
 
@@ -90,10 +90,10 @@
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmaps.org:128.40.168.104
-+tile.openstreetmaps.org:193.63.75.26:1800
-+a.tile.openstreetmaps.org:193.63.75.26:900
-+b.tile.openstreetmaps.org:128.40.168.95:900
-+c.tile.openstreetmaps.org:128.40.168.95:900
++tile.openstreetmaps.org:193.63.75.26:600
++a.tile.openstreetmaps.org:193.63.75.26:600
++b.tile.openstreetmaps.org:128.40.168.95:600
++c.tile.openstreetmaps.org:128.40.168.95:600
 +yevaud.ucl.openstreetmaps.org:10.0.0.15
 +yevaud.oob.openstreetmaps.org:10.0.1.15
 
@@ -152,12 +152,17 @@
 +foundation.openstreetmaps.org:128.40.168.102
 +ridley.ucl.openstreetmaps.org:10.0.0.3
 
-# APC power switch
+# APC power switches
 
 +apc1.ucl.openstreetmaps.org:10.0.0.49
 +apc2.ucl.openstreetmaps.org:10.0.0.50
 +apc3.ucl.openstreetmaps.org:10.0.0.51
 
+# Managed network switches
+
++switch1.openstreetmaps.org:193.63.75.102
++switch2.ic.openstreetmaps.org:146.179.159.169
+
 # Forum server
 
 +forum.openstreetmaps.org:93.186.179.231
@@ -186,10 +191,10 @@
 
 # Wiki server
 
-+konqi.openstreetmaps.org:193.63.75.26
-+konqi.ilo.openstreetmaps.org:193.63.75.27
-+wiki.openstreetmaps.org:193.63.75.26
-+dump.wiki.openstreetmaps.org:193.63.75.26
++konqi.openstreetmaps.org:193.63.75.26:600
++konqi.ilo.openstreetmaps.org:193.63.75.27:600
++wiki.openstreetmaps.org:193.63.75.26:600
++dump.wiki.openstreetmaps.org:193.63.75.26:600
 #+konqi.ic.openstreetmaps.org:10.0.16.1
 #+konqi.oob.openstreetmaps.org:10.0.17.1
 

diff --git a/data/osm.org b/data/osm.org
index 7e35ff95c07f9f96abd71ab25a95ce73c46acfae..d98d7eb6f87f144856217754083aa75f2adb757b 100644 (file)
--- a/data/osm.org
+++ b/data/osm.org
@@ -24,20 +24,20 @@
 # Main web servers and their aliases
 
 +puff.osm.org:193.63.75.99
-#+osm.org:193.63.75.101:600
-#+www.osm.org:193.63.75.99:600
-#+api.osm.org:193.63.75.99:600
-#+maps.osm.org:193.63.75.99:600
-#+mapz.osm.org:193.63.75.99:600
++osm.org:193.63.75.99:600
++www.osm.org:193.63.75.99:600
++api.osm.org:193.63.75.99:600
++maps.osm.org:193.63.75.99:600
++mapz.osm.org:193.63.75.99:600
 +puff.ic.osm.org:146.179.159.162
 +puff.oob.osm.org:146.179.159.188
 
 +fuchur.osm.org:128.40.168.105:600
-+osm.org:128.40.168.105:600
-+www.osm.org:128.40.168.105:600
-+api.osm.org:128.40.168.105:600
-+maps.osm.org:128.40.168.105:600
-+mapz.osm.org:128.40.168.105:600
+#+osm.org:128.40.168.105:600
+#+www.osm.org:128.40.168.105:600
+#+api.osm.org:128.40.168.105:600
+#+maps.osm.org:128.40.168.105:600
+#+mapz.osm.org:128.40.168.105:600
 +fuchur.ucl.osm.org:10.0.0.9
 +fuchur.oob.osm.org:10.0.1.9:600
 
@@ -90,10 +90,10 @@
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.osm.org:128.40.168.104
-+tile.osm.org:193.63.75.26:1800
-+a.tile.osm.org:193.63.75.26:900
-+b.tile.osm.org:128.40.168.95:900
-+c.tile.osm.org:128.40.168.95:900
++tile.osm.org:193.63.75.26:600
++a.tile.osm.org:193.63.75.26:600
++b.tile.osm.org:128.40.168.95:600
++c.tile.osm.org:128.40.168.95:600
 +yevaud.ucl.osm.org:10.0.0.15
 +yevaud.oob.osm.org:10.0.1.15
 
@@ -152,12 +152,17 @@
 +foundation.osm.org:128.40.168.102
 +ridley.ucl.osm.org:10.0.0.3
 
-# APC power switch
+# APC power switches
 
 +apc1.ucl.osm.org:10.0.0.49
 +apc2.ucl.osm.org:10.0.0.50
 +apc3.ucl.osm.org:10.0.0.51
 
+# Managed network switches
+
++switch1.osm.org:193.63.75.102
++switch2.ic.osm.org:146.179.159.169
+
 # Forum server
 
 +forum.osm.org:93.186.179.231
@@ -186,10 +191,10 @@
 
 # Wiki server
 
-+konqi.osm.org:193.63.75.26
-+konqi.ilo.osm.org:193.63.75.27
-+wiki.osm.org:193.63.75.26
-+dump.wiki.osm.org:193.63.75.26
++konqi.osm.org:193.63.75.26:600
++konqi.ilo.osm.org:193.63.75.27:600
++wiki.osm.org:193.63.75.26:600
++dump.wiki.osm.org:193.63.75.26:600
 #+konqi.ic.osm.org:10.0.16.1
 #+konqi.oob.osm.org:10.0.17.1
 

diff --git a/src/openstreetmap b/src/openstreetmap
index 90f06ddb5839582d2c869e41f9c2a809dd1cc462..ccd9ed0a956b2fd3e8a6424935d75a35b408c181 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -90,10 +90,10 @@
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmap:128.40.168.104
-+tile.openstreetmap:193.63.75.26:1800
-+a.tile.openstreetmap:193.63.75.26:900
-+b.tile.openstreetmap:128.40.168.95:900
-+c.tile.openstreetmap:128.40.168.95:900
++tile.openstreetmap:193.63.75.26:600
++a.tile.openstreetmap:193.63.75.26:600
++b.tile.openstreetmap:128.40.168.95:600
++c.tile.openstreetmap:128.40.168.95:600
 +yevaud.ucl.openstreetmap:10.0.0.15
 +yevaud.oob.openstreetmap:10.0.1.15
 
@@ -191,10 +191,10 @@
 
 # Wiki server
 
-+konqi.openstreetmap:193.63.75.26
-+konqi.ilo.openstreetmap:193.63.75.27
-+wiki.openstreetmap:193.63.75.26
-+dump.wiki.openstreetmap:193.63.75.26
++konqi.openstreetmap:193.63.75.26:600
++konqi.ilo.openstreetmap:193.63.75.27:600
++wiki.openstreetmap:193.63.75.26:600
++dump.wiki.openstreetmap:193.63.75.26:600
 #+konqi.ic.openstreetmap:10.0.16.1
 #+konqi.oob.openstreetmap:10.0.17.1