Remove www from puff

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 0eb8bf955e338a66549f98eaf14d554324c3816a..f9aba2691573e51855f6834de301ff000799c785 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -24,22 +24,22 @@
 # Main web servers and their aliases
 
 +puff.openstreetmap:193.63.75.99
 # Main web servers and their aliases
 
 +puff.openstreetmap:193.63.75.99

-+openstreetmap:193.63.75.99:600
-+www.openstreetmap:193.63.75.99:600
-+api.openstreetmap:193.63.75.99:600
-+maps.openstreetmap:193.63.75.99:600
-+mapz.openstreetmap:193.63.75.99:600
+#+openstreetmap:193.63.75.99:600
+#+www.openstreetmap:193.63.75.99:600
+#+api.openstreetmap:193.63.75.99:600
+#+maps.openstreetmap:193.63.75.99:600
+#+mapz.openstreetmap:193.63.75.99:600

 +puff.ic.openstreetmap:146.179.159.162
 +puff.oob.openstreetmap:146.179.159.188
 
 +puff.ic.openstreetmap:146.179.159.162
 +puff.oob.openstreetmap:146.179.159.188
 

-+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:600
++fiddlestick.openstreetmap:193.63.75.100
++openstreetmap:193.63.75.100:600
++www.openstreetmap:193.63.75.100:600
++api.openstreetmap:193.63.75.100:600
++maps.openstreetmap:193.63.75.100:600
++mapz.openstreetmap:193.63.75.100:600
++fiddlestick.ic.openstreetmap:146.179.159.163
++fiddlestick.oob.openstreetmap:146.179.159.187

 
 # Rails application servers
 
 
 # Rails application servers
 


@@ -49,14 +49,14 @@
 +sarel.ic.openstreetmap:146.179.159.166
 +rails2.ic.openstreetmap:146.179.159.166
 +sarel.oob.openstreetmap:146.179.159.184
 +sarel.ic.openstreetmap:146.179.159.166
 +rails2.ic.openstreetmap:146.179.159.166
 +sarel.oob.openstreetmap:146.179.159.184

-+norbert.ucl.openstreetmap:10.0.0.12
-+rails3.ucl.openstreetmap:10.0.0.12
-+norbert.oob.openstreetmap:10.0.1.12:600
++norbert.ic.openstreetmap:146.179.159.167
++rails3.ic.openstreetmap:146.179.159.167
++norbert.oob.openstreetmap:146.179.159.183

 
 # Gazetteer (nominatim) server
 
 +poldi.openstreetmap:128.40.168.106 
 
 # Gazetteer (nominatim) server
 
 +poldi.openstreetmap:128.40.168.106 

-+nominatim.openstreetmap:128.40.168.106
++nominatim.openstreetmap:193.63.75.98:600

 +poldi.ucl.openstreetmap:10.0.0.16
 +poldi.oob.openstreetmap:10.0.1.16
 
 +poldi.ucl.openstreetmap:10.0.0.16
 +poldi.oob.openstreetmap:10.0.1.16
 


@@ -90,10 +90,11 @@
 # Mapnik tile server, with wildcard alias to allow parallel loading
 
 +yevaud.openstreetmap:128.40.168.104
 # 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:193.63.75.26:600
++c.tile.openstreetmap:128.40.168.95:600
++parent.tile.openstreetmap:128.40.168.104:300

 +yevaud.ucl.openstreetmap:10.0.0.15
 +yevaud.oob.openstreetmap:10.0.1.15
 
 +yevaud.ucl.openstreetmap:10.0.0.15
 +yevaud.oob.openstreetmap:10.0.1.15
 


@@ -152,12 +153,28 @@
 +foundation.openstreetmap:128.40.168.102
 +ridley.ucl.openstreetmap:10.0.0.3
 
 +foundation.openstreetmap:128.40.168.102
 +ridley.ucl.openstreetmap:10.0.0.3
 

-# APC power switch
+# Spare machines
+
++urmel.ucl.openstreetmap:10.0.0.6
++urmel.oob.openstreetmap:10.0.1.6
++faffy.ucl.openstreetmap:10.0.0.7
++faffy.oob.openstreetmap:10.0.1.7
++soup.ucl.openstreetmap:10.0.0.8
++soup.oob.openstreetmap:10.0.1.8
++eustace.ucl.openstreetmap:10.0.0.9
++eustace.oob.openstreetmap:10.0.1.9
+
+# APC power switches

 
 +apc1.ucl.openstreetmap:10.0.0.49
 +apc2.ucl.openstreetmap:10.0.0.50
 +apc3.ucl.openstreetmap:10.0.0.51
 
 
 +apc1.ucl.openstreetmap:10.0.0.49
 +apc2.ucl.openstreetmap:10.0.0.50
 +apc3.ucl.openstreetmap:10.0.0.51
 

+# Managed network switches
+
++switch1.openstreetmap:193.63.75.102
++switch2.ic.openstreetmap:146.179.159.169
+

 # Forum server
 
 +forum.openstreetmap:93.186.179.231
 # Forum server
 
 +forum.openstreetmap:93.186.179.231


@@ -186,10 +203,10 @@
 
 # Wiki server
 
 
 # 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
 
 #+konqi.ic.openstreetmap:10.0.16.1
 #+konqi.oob.openstreetmap:10.0.17.1