From ca2073ecc087d55e6a63cc6b129453b51774c5d6 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 1 Dec 2016 20:32:37 +0000 Subject: [PATCH] Reduce DNS expiry for IC machines --- src/openstreetmap | 122 +++++++++++++++++++++++----------------------- src/osmfoundation | 16 +++--- 2 files changed, 69 insertions(+), 69 deletions(-) diff --git a/src/openstreetmap b/src/openstreetmap index b6936b4..2284c2d 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -156,10 +156,10 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com +poldi.ic.openstreetmap:146.179.159.164:600 +poldi.oob.openstreetmap:146.179.159.186:600 -+pummelzacken.openstreetmap:128.40.45.204 ++pummelzacken.openstreetmap:128.40.45.204:3600 #+nominatim.openstreetmap:128.40.45.204:600 -+pummelzacken.ucl.openstreetmap:10.0.0.20 -+pummelzacken.oob.openstreetmap:10.0.1.20 ++pummelzacken.ucl.openstreetmap:10.0.0.20:3600 ++pummelzacken.oob.openstreetmap:10.0.1.20:3600 +dulcy.openstreetmap:193.63.75.109 3dulcy.openstreetmap:20010630001205000ec47afffe6696d2 @@ -170,24 +170,24 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com # JXAPI server -+norbert.openstreetmap:128.40.45.202 ++norbert.openstreetmap:128.40.45.202:3600 +jxapi.openstreetmap:128.40.45.202:600 -+norbert.ucl.openstreetmap:10.0.0.5 -+norbert.oob.openstreetmap:10.0.1.5 ++norbert.ucl.openstreetmap:10.0.0.5:3600 ++norbert.oob.openstreetmap:10.0.1.5:3600 # OWL server -+zark.openstreetmap:128.40.45.209 -+owl.openstreetmap:128.40.45.209 -+zark.ucl.openstreetmap:10.0.0.8 -+zark.oob.openstreetmap:10.0.1.8 ++zark.openstreetmap:128.40.45.209:3600 ++owl.openstreetmap:128.40.45.209:3600 ++zark.ucl.openstreetmap:10.0.0.8:3600 ++zark.oob.openstreetmap:10.0.1.8:3600 # Taginfo servers -+grindtooth.openstreetmap:128.40.45.199 ++grindtooth.openstreetmap:128.40.45.199:3600 #+taginfo.openstreetmap:128.40.45.199:600 -+grindtooth.ucl.openstreetmap:10.0.0.19 -+grindtooth.oob.openstreetmap:10.0.1.19 ++grindtooth.ucl.openstreetmap:10.0.0.19:3600 ++grindtooth.oob.openstreetmap:10.0.1.19:3600 +stormfly-01.openstreetmap:140.211.167.104 +taginfo.openstreetmap:140.211.167.104:600 @@ -199,9 +199,9 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com 3orm.openstreetmap:200106300012050002e081fffec52a8c #+orm.ic.openstreetmap:10.0.16.2 +orm.oob.openstreetmap:146.179.159.175:600 -+yevaud.openstreetmap:128.40.45.208 -+yevaud.ucl.openstreetmap:10.0.0.15 -+yevaud.oob.openstreetmap:10.0.1.15 ++yevaud.openstreetmap:128.40.45.208:3600 ++yevaud.ucl.openstreetmap:10.0.0.15:3600 ++yevaud.oob.openstreetmap:10.0.1.15:3600 +vial.openstreetmap:138.201.195.31 3vial.openstreetmap:2a0104f801723cde0000000000000002 Ctile.openstreetmap:tile.geo.openstreetmap.org @@ -254,38 +254,38 @@ Cparent.tile.openstreetmap:render.openstreetmap.org # Development server with wildcard alias for user sites -+errol.openstreetmap:128.40.45.196 -+dev.openstreetmap:128.40.45.196 -+*.dev.openstreetmap:128.40.45.196 -+ooc.openstreetmap:128.40.45.196 -+a.ooc.openstreetmap:128.40.45.196 -+b.ooc.openstreetmap:128.40.45.196 -+c.ooc.openstreetmap:128.40.45.196 -+npe.openstreetmap:128.40.45.196 -+errol.ucl.openstreetmap:10.0.0.14 -+errol.oob.openstreetmap:10.0.1.14 ++errol.openstreetmap:128.40.45.196:3600 ++dev.openstreetmap:128.40.45.196:3600 ++*.dev.openstreetmap:128.40.45.196:3600 ++ooc.openstreetmap:128.40.45.196:3600 ++a.ooc.openstreetmap:128.40.45.196:3600 ++b.ooc.openstreetmap:128.40.45.196:3600 ++c.ooc.openstreetmap:128.40.45.196:3600 ++npe.openstreetmap:128.40.45.196:3600 ++errol.ucl.openstreetmap:10.0.0.14:3600 ++errol.oob.openstreetmap:10.0.1.14:3600 # Foundation server -+ridley.openstreetmap:128.40.45.205 -+otrs.openstreetmap:128.40.45.205 -+blog.openstreetmap:128.40.45.205 -+foundation.openstreetmap:128.40.45.205 -+ridley.ucl.openstreetmap:10.0.0.3 -+ridley.oob.openstreetmap:10.0.1.3 ++ridley.openstreetmap:128.40.45.205:3600 ++otrs.openstreetmap:128.40.45.205:3600 ++blog.openstreetmap:128.40.45.205:3600 ++foundation.openstreetmap:128.40.45.205:3600 ++ridley.ucl.openstreetmap:10.0.0.3:3600 ++ridley.oob.openstreetmap:10.0.1.3:3600 # Piwik server -+eustace.openstreetmap:128.40.45.197 -+piwik.openstreetmap:128.40.45.197 -+eustace.ucl.openstreetmap:10.0.0.9 -+eustace.oob.openstreetmap:10.0.1.9 ++eustace.openstreetmap:128.40.45.197:3600 ++piwik.openstreetmap:128.40.45.197:3600 ++eustace.ucl.openstreetmap:10.0.0.9:3600 ++eustace.oob.openstreetmap:10.0.1.9:3600 # Imagery servers -+draco.openstreetmap:128.40.45.195 -+draco.ucl.openstreetmap:10.0.0.11 -+draco.oob.openstreetmap:10.0.1.11 ++draco.openstreetmap:128.40.45.195:3600 ++draco.ucl.openstreetmap:10.0.0.11:3600 ++draco.oob.openstreetmap:10.0.1.11:3600 +kessie.openstreetmap:178.250.74.36 3kessie.openstreetmap:2a02165800040000dad385fffe5d875e @@ -309,29 +309,29 @@ Cparent.tile.openstreetmap:render.openstreetmap.org # Munin server -+urmel.openstreetmap:128.40.45.207 ++urmel.openstreetmap:128.40.45.207:3600 +munin.openstreetmap:128.40.45.207:600 -+urmel.ucl.openstreetmap:10.0.0.6 -+urmel.oob.openstreetmap:10.0.1.6 ++urmel.ucl.openstreetmap:10.0.0.6:3600 ++urmel.oob.openstreetmap:10.0.1.6:3600 # Gosmore routing server -+sarel.openstreetmap:128.40.45.206 -+sarel.ucl.openstreetmap:10.0.0.12 -+sarel.oob.openstreetmap:10.0.1.12 ++sarel.openstreetmap:128.40.45.206:3600 ++sarel.ucl.openstreetmap:10.0.0.12:3600 ++sarel.oob.openstreetmap:10.0.1.12:3600 # Forum server -+clifford.openstreetmap:128.40.45.194 ++clifford.openstreetmap:128.40.45.194:3600 +forum.openstreetmap:128.40.45.194:600 -+clifford.ucl.openstreetmap:10.0.0.17 -+clifford.oob.openstreetmap:10.0.1.17 ++clifford.ucl.openstreetmap:10.0.0.17:3600 ++clifford.oob.openstreetmap:10.0.1.17:3600 # Loan machine for emacsen -+ascalon.openstreetmap:128.40.45.193 -+ascalon.ucl.openstreetmap:10.0.0.18 -+ascalon.oob.openstreetmap:10.0.1.18 ++ascalon.openstreetmap:128.40.45.193:3600 ++ascalon.ucl.openstreetmap:10.0.0.18:3600 ++ascalon.oob.openstreetmap:10.0.1.18:3600 # Spare machines @@ -389,16 +389,16 @@ Cparent.tile.openstreetmap:render.openstreetmap.org # GPS tile server -+noquiklos.openstreetmap:128.40.45.201 -+gps.tile.openstreetmap:128.40.45.201 -+gps-a.tile.openstreetmap:128.40.45.201 -+gps-b.tile.openstreetmap:128.40.45.201 -+gps-c.tile.openstreetmap:128.40.45.201 -+a.gps-tile.openstreetmap:128.40.45.201 -+b.gps-tile.openstreetmap:128.40.45.201 -+c.gps-tile.openstreetmap:128.40.45.201 -+noquiklos.ucl.openstreetmap:10.0.0.13 -+noquiklos.oob.openstreetmap:10.0.1.13 ++noquiklos.openstreetmap:128.40.45.201:3600 ++gps.tile.openstreetmap:128.40.45.201:3600 ++gps-a.tile.openstreetmap:128.40.45.201:3600 ++gps-b.tile.openstreetmap:128.40.45.201:3600 ++gps-c.tile.openstreetmap:128.40.45.201:3600 ++a.gps-tile.openstreetmap:128.40.45.201:3600 ++b.gps-tile.openstreetmap:128.40.45.201:3600 ++c.gps-tile.openstreetmap:128.40.45.201:3600 ++noquiklos.ucl.openstreetmap:10.0.0.13:3600 ++noquiklos.oob.openstreetmap:10.0.1.13:3600 # Tile cache servers diff --git a/src/osmfoundation b/src/osmfoundation index 41bc3ca..e8ec7ad 100644 --- a/src/osmfoundation +++ b/src/osmfoundation @@ -47,14 +47,14 @@ Csites.osmfoundation:ghs.google.com # Main web server and it's aliases -+osmfoundation:128.40.45.205:600 -+old.osmfoundation:128.40.45.205 ++osmfoundation:128.40.45.205:600:3600 ++old.osmfoundation:128.40.45.205:3600 +www.osmfoundation:128.40.45.205:600 +wiki.osmfoundation:128.40.45.205:600 +blog.osmfoundation:128.40.45.205:600 -+vote.osmfoundation:128.40.45.205 -+accounts.osmfoundation:128.40.45.205 -+crm.osmfoundation:128.40.45.205 -+join.osmfoundation:128.40.45.205 -+board.osmfoundation:128.40.45.205 -+dwg.osmfoundation:128.40.45.205 ++vote.osmfoundation:128.40.45.205:3600 ++accounts.osmfoundation:128.40.45.205:3600 ++crm.osmfoundation:128.40.45.205:3600 ++join.osmfoundation:128.40.45.205:3600 ++board.osmfoundation:128.40.45.205:3600 ++dwg.osmfoundation:128.40.45.205:3600 -- 2.43.2