Drop puff from www duties

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index d23f2173816c09779638cb0d8866495bebeb3558..084847eabd80a81105a89c3a1d30b17246df5599 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -23,40 +23,35 @@
 
 # Main web servers and their aliases
 
-+puff.openstreetmap:128.40.168.98
-+openstreetmap:128.40.168.98:3600
-+www.openstreetmap:128.40.168.98:3600
-+api.openstreetmap:128.40.168.98:3600
-+maps.openstreetmap:128.40.168.98:3600
-+mapz.openstreetmap:128.40.168.98:3600
-+puff.ilo.openstreetmap:10.0.0.58
++puff.openstreetmap:128.40.168.98:600
+#+openstreetmap:128.40.168.98:600
+#+www.openstreetmap:128.40.168.98:600
+#+api.openstreetmap:128.40.168.98:600
+#+maps.openstreetmap:128.40.168.98:600
+#+mapz.openstreetmap:128.40.168.98:600
 +puff.ucl.openstreetmap:10.0.0.8
-+puff.oob.openstreetmap:10.0.1.8
-
-+fuchur.openstreetmap:128.40.168.105
-+openstreetmap:128.40.168.105:3600
-+www.openstreetmap:128.40.168.105:3600
-+api.openstreetmap:128.40.168.105:3600
-+maps.openstreetmap:128.40.168.105:3600
-+mapz.openstreetmap:128.40.168.105:3600
-+fuchur.ilo.openstreetmap:10.0.0.59
++puff.oob.openstreetmap:10.0.1.8:600
+
++fuchur.openstreetmap:128.40.168.105:600
++openstreetmap:128.40.168.105:600
++www.openstreetmap:128.40.168.105:600
++api.openstreetmap:128.40.168.105:600
++maps.openstreetmap:128.40.168.105:600
++mapz.openstreetmap:128.40.168.105:600
 +fuchur.ucl.openstreetmap:10.0.0.9
-+fuchur.oob.openstreetmap:10.0.1.9
++fuchur.oob.openstreetmap:10.0.1.9:600
 
 # Rails application servers
 
-+draco.ilo.openstreetmap:10.0.0.60
-+sarel.ilo.openstreetmap:10.0.0.61
-+norbert.ilo.openstreetmap:10.0.0.62
 +draco.ucl.openstreetmap:10.0.0.10
 +rails1.ucl.openstreetmap:10.0.0.10
-+draco.oob.openstreetmap:10.0.1.10
++draco.oob.openstreetmap:10.0.1.10:600
 +sarel.ucl.openstreetmap:10.0.0.11
 +rails2.ucl.openstreetmap:10.0.0.11
-+sarel.oob.openstreetmap:10.0.1.11
++sarel.oob.openstreetmap:10.0.1.11:600
 +norbert.ucl.openstreetmap:10.0.0.12
 +rails3.ucl.openstreetmap:10.0.0.12
-+norbert.oob.openstreetmap:10.0.1.12
++norbert.oob.openstreetmap:10.0.1.12:600
 
 # Gazetteer (nominatim) server
 
@@ -90,7 +85,7 @@
 +jxapi.openstreetmap:128.40.168.100
 +azure.ilo.openstreetmap:10.0.0.55
 +azure.ucl.openstreetmap:10.0.0.5
-+azure.ilo.openstreetmap:10.0.1.5
++azure.oob.openstreetmap:10.0.1.5
 
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
@@ -99,23 +94,21 @@
 +a.tile.openstreetmap:193.63.75.26:900
 +b.tile.openstreetmap:128.40.168.95:900
 +c.tile.openstreetmap:128.40.168.95:900
-+yevaud.ilo.openstreetmap:10.0.0.65
 +yevaud.ucl.openstreetmap:10.0.0.15
 +yevaud.oob.openstreetmap:10.0.1.15
 
 # Services machine
 
-+horntail.openstreetmap:128.40.168.99
-+planet.openstreetmap:128.40.168.99
-+munin.openstreetmap:128.40.168.99
-+apt.openstreetmap:128.40.168.99
-+stats.openstreetmap:128.40.168.99
-+chef.openstreetmap:128.40.168.99
-+backup.openstreetmap:128.40.168.99
-+horntail.ilo.openstreetmap:10.0.0.57
++horntail.openstreetmap:128.40.168.99:600
++planet.openstreetmap:128.40.168.99:600
++munin.openstreetmap:128.40.168.99:600
++apt.openstreetmap:128.40.168.99:600
++stats.openstreetmap:128.40.168.99:600
++chef.openstreetmap:128.40.168.99:600
++backup.openstreetmap:128.40.168.99:600
 +horntail.ucl.openstreetmap:10.0.0.7
 +backup.ucl.openstreetmap:10.0.0.7
-+horntail.oob.openstreetmap:10.0.1.7
++horntail.oob.openstreetmap:10.0.1.7:600
 
 # Osmarender tile server, with wildcard alias to allow parallel loading
 
@@ -130,10 +123,9 @@
 
 # Database server
 
-+smaug.ilo.openstreetmap:10.0.0.63
 +smaug.ucl.openstreetmap:10.0.0.13
-+db.ucl.openstreetmap:10.0.0.13:60
-+smaug.oob.openstreetmap:10.0.1.13
++db.ucl.openstreetmap:10.0.0.13
++smaug.oob.openstreetmap:10.0.1.13:600
 
 # Development server with wildcard alias for user sites
 
@@ -149,7 +141,6 @@
 +a.os.openstreetmap:128.40.168.103
 +b.os.openstreetmap:128.40.168.103
 +c.os.openstreetmap:128.40.168.103
-+errol.ilo.openstreetmap:10.0.0.64
 +errol.ucl.openstreetmap:10.0.0.14
 +errol.oob.openstreetmap:10.0.1.14