Revert "Reduce TTL on all names which point to UCL IP addresses"

This reverts commit e3a1fef300e170aff59bf8672671c3f3ac208c74.

diff --git a/src/opengeodata b/src/opengeodata
index 7586357f12055b48713bc30118618422298c17f1..69ab1548ad04496152426b80b12c2c97ec92faeb 100644 (file)
--- a/src/opengeodata
+++ b/src/opengeodata
@@ -10,6 +10,6 @@
 
 # Main web server and it's aliases
 
-+opengeodata:128.40.168.102:600
-+old.opengeodata:128.40.168.102:600
-+www.opengeodata:128.40.168.102:600
++opengeodata:128.40.168.102
++old.opengeodata:128.40.168.102
++www.opengeodata:128.40.168.102

diff --git a/src/openstreetmap b/src/openstreetmap
index 48342f833a87afed5710976651b33a4911b1d155..aff7b013e4895153ca521a6826dc9d96354cad00 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -99,12 +99,12 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 
 # Nominatim servers
 
-+poldi.openstreetmap:128.40.168.106:600
-+nominatim.openstreetmap:128.40.168.106:600
++poldi.openstreetmap:128.40.168.106 
++nominatim.openstreetmap:128.40.168.106:3600
 +poldi.ucl.openstreetmap:10.0.0.16
 +poldi.oob.openstreetmap:10.0.1.16
 
-+pummelzacken.openstreetmap:128.40.168.105:600
++pummelzacken.openstreetmap:128.40.168.105
 +pummelzacken.ucl.openstreetmap:10.0.0.20
 +pummelzacken.oob.openstreetmap:10.0.1.20
 
@@ -116,14 +116,14 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 
 # OWL server
 
-+zark.openstreetmap:128.40.168.107:600
-+owl.openstreetmap:128.40.168.107:600
++zark.openstreetmap:128.40.168.107
++owl.openstreetmap:128.40.168.107
 +zark.ucl.openstreetmap:10.0.0.8
 +zark.oob.openstreetmap:10.0.1.8
 
 # Taginfo server
 
-+grindtooth.openstreetmap:128.40.168.100:600
++grindtooth.openstreetmap:128.40.168.100
 +taginfo.openstreetmap:128.40.168.100:600
 +grindtooth.ucl.openstreetmap:10.0.0.19
 +grindtooth.oob.openstreetmap:10.0.1.19
@@ -134,7 +134,7 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
 3orm.openstreetmap:200106300012050002e081fffec52a8c
 #+orm.ic.openstreetmap:10.0.16.2
 +orm.oob.openstreetmap:146.179.159.175
-+yevaud.openstreetmap:128.40.168.104:600
++yevaud.openstreetmap:128.40.168.104
 +yevaud.ucl.openstreetmap:10.0.0.15
 +yevaud.oob.openstreetmap:10.0.1.15
 Ctile.openstreetmap:tile.geo.openstreetmap.org
@@ -174,74 +174,74 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 
 # Development server with wildcard alias for user sites
 
-+errol.openstreetmap:128.40.168.103:600
-+dev.openstreetmap:128.40.168.103:600
-+*.dev.openstreetmap:128.40.168.103:600
-+ooc.openstreetmap:128.40.168.103:600
-+a.ooc.openstreetmap:128.40.168.103:600
-+b.ooc.openstreetmap:128.40.168.103:600
-+c.ooc.openstreetmap:128.40.168.103:600
-+npe.openstreetmap:128.40.168.103:600
++errol.openstreetmap:128.40.168.103
++dev.openstreetmap:128.40.168.103
++*.dev.openstreetmap:128.40.168.103
++ooc.openstreetmap:128.40.168.103
++a.ooc.openstreetmap:128.40.168.103
++b.ooc.openstreetmap:128.40.168.103
++c.ooc.openstreetmap:128.40.168.103
++npe.openstreetmap:128.40.168.103
 +errol.ucl.openstreetmap:10.0.0.14
 +errol.oob.openstreetmap:10.0.1.14
 
 # Foundation server
 
-+ridley.openstreetmap:128.40.168.102:600
-+otrs.openstreetmap:128.40.168.102:600
-+thinkup.openstreetmap:128.40.168.102:600
-+blog.openstreetmap:128.40.168.102:600
-+foundation.openstreetmap:128.40.168.102:600
++ridley.openstreetmap:128.40.168.102
++otrs.openstreetmap:128.40.168.102
++thinkup.openstreetmap:128.40.168.102
++blog.openstreetmap:128.40.168.102
++foundation.openstreetmap:128.40.168.102
 +ridley.ucl.openstreetmap:10.0.0.3
 +ridley.oob.openstreetmap:10.0.1.3
 
 # Piwik server
 
-+eustace.openstreetmap:128.40.168.101:600
-+piwik.openstreetmap:128.40.168.101:600
++eustace.openstreetmap:128.40.168.101
++piwik.openstreetmap:128.40.168.101
 +eustace.ucl.openstreetmap:10.0.0.9
 +eustace.oob.openstreetmap:10.0.1.9
 
 # Imagery servers
 
-+faffy.openstreetmap:128.40.168.108:600
-+agri.openstreetmap:128.40.168.108:600
-+a.agri.openstreetmap:128.40.168.108:600
-+b.agri.openstreetmap:128.40.168.108:600
-+c.agri.openstreetmap:128.40.168.108:600
-+os.openstreetmap:128.40.168.108:600
-+a.os.openstreetmap:128.40.168.108:600
-+b.os.openstreetmap:128.40.168.108:600
-+c.os.openstreetmap:128.40.168.108:600
++faffy.openstreetmap:128.40.168.108
++agri.openstreetmap:128.40.168.108:3600
++a.agri.openstreetmap:128.40.168.108:3600
++b.agri.openstreetmap:128.40.168.108:3600
++c.agri.openstreetmap:128.40.168.108:3600
++os.openstreetmap:128.40.168.108:3600
++a.os.openstreetmap:128.40.168.108:3600
++b.os.openstreetmap:128.40.168.108:3600
++c.os.openstreetmap:128.40.168.108:3600
 +faffy.ucl.openstreetmap:10.0.0.7
 +faffy.oob.openstreetmap:10.0.1.7
 
-+draco.openstreetmap:128.40.168.95:600
++draco.openstreetmap:128.40.168.95 
 +draco.ucl.openstreetmap:10.0.0.11
 +draco.oob.openstreetmap:10.0.1.11
 
 # Munin server
 
-+urmel.openstreetmap:128.40.168.96:600
++urmel.openstreetmap:128.40.168.96
 +munin.openstreetmap:128.40.168.96:600
 +urmel.ucl.openstreetmap:10.0.0.6
 +urmel.oob.openstreetmap:10.0.1.6
 
 # Gosmore routing server
 
-+sarel.openstreetmap:128.40.168.97:600
++sarel.openstreetmap:128.40.168.97
 +sarel.ucl.openstreetmap:10.0.0.12
 +sarel.oob.openstreetmap:10.0.1.12
 
 # Forum server
 
-+clifford.openstreetmap:128.40.168.98:600
++clifford.openstreetmap:128.40.168.98
 +clifford.ucl.openstreetmap:10.0.0.17
 +clifford.oob.openstreetmap:10.0.1.17
 
 # Loan machine for emacsen
 
-+ascalon.openstreetmap:128.40.45.193:600
++ascalon.openstreetmap:128.40.45.193
 #+ascalon.ucl.openstreetmap:10.0.0.18
 #+ascalon.oob.openstreetmap:10.0.1.18
 
@@ -301,14 +301,14 @@ Cparent.tile.openstreetmap:render.openstreetmap.org
 
 # GPS tile server
 
-+noquiklos.openstreetmap:128.40.168.99:600
-+gps.tile.openstreetmap:128.40.168.99:600
-+gps-a.tile.openstreetmap:128.40.168.99:600
-+gps-b.tile.openstreetmap:128.40.168.99:600
-+gps-c.tile.openstreetmap:128.40.168.99:600
-+a.gps-tile.openstreetmap:128.40.168.99:600
-+b.gps-tile.openstreetmap:128.40.168.99:600
-+c.gps-tile.openstreetmap:128.40.168.99:600
++noquiklos.openstreetmap:128.40.168.99
++gps.tile.openstreetmap:128.40.168.99
++gps-a.tile.openstreetmap:128.40.168.99
++gps-b.tile.openstreetmap:128.40.168.99
++gps-c.tile.openstreetmap:128.40.168.99
++a.gps-tile.openstreetmap:128.40.168.99
++b.gps-tile.openstreetmap:128.40.168.99
++c.gps-tile.openstreetmap:128.40.168.99
 +noquiklos.ucl.openstreetmap:10.0.0.13
 +noquiklos.oob.openstreetmap:10.0.1.13
 

diff --git a/src/osmfoundation b/src/osmfoundation
index cdb08a2faa1ca3894a528c9eb68e3da9222ccecf..5df994b362fcb36e7c794f8f938739116682063b 100644 (file)
--- a/src/osmfoundation
+++ b/src/osmfoundation
@@ -48,10 +48,10 @@ Csites.osmfoundation:ghs.google.com
 # Main web server and it's aliases
 
 +osmfoundation:128.40.168.102:600
-+old.osmfoundation:128.40.168.102:600
++old.osmfoundation:128.40.168.102
 +www.osmfoundation:128.40.168.102:600
 +wiki.osmfoundation:128.40.168.102:600
 +blog.osmfoundation:128.40.168.102:600
-+vote.osmfoundation:128.40.168.102:600
-+accounts.osmfoundation:128.40.168.102:600
-+crm.osmfoundation:128.40.168.102:600
++vote.osmfoundation:128.40.168.102
++accounts.osmfoundation:128.40.168.102
++crm.osmfoundation:128.40.168.102

diff --git a/src/stateofthemap b/src/stateofthemap
index 5f9400f76aa8f7f7dd59d8306affd61a0cf226e0..c13f818a1db50a98c8c591578a755b5be59f99d9 100644 (file)
--- a/src/stateofthemap
+++ b/src/stateofthemap
@@ -26,9 +26,9 @@ Clogin.stateofthemap:ghs.google.com
 +www.stateofthemap:188.226.171.99:3600
 +2014.stateofthemap:188.226.171.99
 +2013.stateofthemap:83.170.104.37
-+2012.stateofthemap:128.40.168.102:600
-+2011.stateofthemap:128.40.168.102:600
-+2010.stateofthemap:128.40.168.102:600
-+2009.stateofthemap:128.40.168.102:600
-+2008.stateofthemap:128.40.168.102:600
-+2007.stateofthemap:128.40.168.102:600
++2012.stateofthemap:128.40.168.102
++2011.stateofthemap:128.40.168.102
++2010.stateofthemap:128.40.168.102
++2009.stateofthemap:128.40.168.102
++2008.stateofthemap:128.40.168.102
++2007.stateofthemap:128.40.168.102

diff --git a/src/switch2osm b/src/switch2osm
index ba41441c072b867cc9fab4ec30771075190ed0f2..17a568c7e328fb4bd79960bd0713d91404dcfa74 100644 (file)
--- a/src/switch2osm
+++ b/src/switch2osm
@@ -10,5 +10,5 @@
 
 # Main web server and it's aliases
 
-+switch2osm:128.40.168.102:600
-+www.switch2osm:128.40.168.102:600
++switch2osm:128.40.168.102
++www.switch2osm:128.40.168.102