Update geographic tile config to use orm and gorwen

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 084847eabd80a81105a89c3a1d30b17246df5599..8019f77580f88426edc2017b3e41ccf5bade2712 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -21,42 +21,49 @@
 
 'openstreetmap:v=spf1 ip4\07289.16.179.150 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ~all
 
 
 'openstreetmap:v=spf1 ip4\07289.16.179.150 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ~all
 

+# Delegate geo.openstreetmap.org to PowerDNS
+
+&geo.openstreetmap:89.16.179.150:a.ns.openstreetmap:86400
+

 # Main web servers and their aliases
 
 # Main web servers and their aliases
 

-+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: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:600
++soup.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
++soup.ic.openstreetmap:146.179.159.162
++soup.oob.openstreetmap:146.179.159.188
+
++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
+
++bowser.ucl.openstreetmap:10.0.0.11
++bowser.oob.openstreetmap:10.0.1.11

 
 # Rails application servers
 
 
 # Rails application servers
 

-+draco.ucl.openstreetmap:10.0.0.10
-+rails1.ucl.openstreetmap:10.0.0.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:600
-+norbert.ucl.openstreetmap:10.0.0.12
-+rails3.ucl.openstreetmap:10.0.0.12
-+norbert.oob.openstreetmap:10.0.1.12:600
++draco.ic.openstreetmap:146.179.159.165
++rails1.ic.openstreetmap:146.179.159.165
++draco.oob.openstreetmap:146.179.159.185
++sarel.ic.openstreetmap:146.179.159.166
++rails2.ic.openstreetmap:146.179.159.166
++sarel.oob.openstreetmap:146.179.159.184
++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
 


@@ -71,15 +78,14 @@
 +xapi.openstreetmap:128.40.168.97
 +fafnir.ucl.openstreetmap:10.0.0.4
 
 +xapi.openstreetmap:128.40.168.97
 +fafnir.ucl.openstreetmap:10.0.0.4
 

-# OWL server
+# Tile cache server

 
 +albi.openstreetmap:128.40.168.95
 
 +albi.openstreetmap:128.40.168.95

-+owl.openstreetmap:128.40.168.95

 +albi.ilo.openstreetmap:10.0.0.52
 +albi.ucl.openstreetmap:10.0.0.2
 +albi.oob.openstreetmap:10.0.1.2
 
 +albi.ilo.openstreetmap:10.0.0.52
 +albi.ucl.openstreetmap:10.0.0.2
 +albi.oob.openstreetmap:10.0.1.2
 

-# Spare server
+# JXAPI server

 
 +azure.openstreetmap:128.40.168.100
 +jxapi.openstreetmap:128.40.168.100
 
 +azure.openstreetmap:128.40.168.100
 +jxapi.openstreetmap:128.40.168.100


@@ -87,28 +93,42 @@
 +azure.ucl.openstreetmap:10.0.0.5
 +azure.oob.openstreetmap:10.0.1.5
 
 +azure.ucl.openstreetmap:10.0.0.5
 +azure.oob.openstreetmap:10.0.1.5
 

+# OWL server
+
++zark.openstreetmap:128.40.168.107
++owl.openstreetmap:128.40.168107
++zark.ucl.openstreetmap:10.0.0.8
++zark.oob.openstreetmap:10.0.1.8
+

 # 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
 

+# Map geographic zones to tile servers
+
++london.tile.openstreetmap:193.63.75.98:3600
++sjobo.tile.openstreetmap:85.30.159.149:3600
+3sjobo.tile..openstreetmap:2a02008000003ff8020f20fffef66c09:3600
+

 # Services machine
 
 # Services machine
 

-+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:600
++horntail.openstreetmap:193.63.75.101
++planet.openstreetmap:193.63.75.101
++munin.openstreetmap:193.63.75.101
++apt.openstreetmap:193.63.75.101
++stats.openstreetmap:193.63.75.101
++chef.openstreetmap:193.63.75.101
++backup.openstreetmap:193.63.75.101
++horntail.ic.openstreetmap:146.179.159.164
++backup.ic.openstreetmap:146.179.159.164
++horntail.oob.openstreetmap:146.179.159.186

 
 # Osmarender tile server, with wildcard alias to allow parallel loading
 
 
 # Osmarender tile server, with wildcard alias to allow parallel loading
 


@@ -123,9 +143,9 @@
 
 # Database server
 
 
 # Database server
 

-+smaug.ucl.openstreetmap:10.0.0.13
-+db.ucl.openstreetmap:10.0.0.13
-+smaug.oob.openstreetmap:10.0.1.13:600
++smaug.ic.openstreetmap:146.179.159.168
++db.ic.openstreetmap:146.179.159.168
++smaug.oob.openstreetmap:146.179.159.182

 
 # Development server with wildcard alias for user sites
 
 
 # Development server with wildcard alias for user sites
 


@@ -148,16 +168,39 @@
 
 +ridley.openstreetmap:128.40.168.102
 +otrs.openstreetmap:128.40.168.102
 
 +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
 +blog.openstreetmap:128.40.168.102
 +foundation.openstreetmap:128.40.168.102

++tickets.openstreetmap:128.40.168.102

 +ridley.ucl.openstreetmap:10.0.0.3
 
 +ridley.ucl.openstreetmap:10.0.0.3
 

-# APC power switch
+# Piwik server
+
++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
+
+# 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
++puff.ucl.openstreetmap:10.0.0.10
++puff.oob.openstreetmap:10.0.1.10
+
+# 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


@@ -173,6 +216,7 @@
 +irc.openstreetmap:89.16.179.150
 +help.openstreetmap:89.16.179.150
 +shop.openstreetmap:89.16.179.150
 +irc.openstreetmap:89.16.179.150
 +help.openstreetmap:89.16.179.150
 +shop.openstreetmap:89.16.179.150

++dns.openstreetmap:89.16.179.150

 +shenron.bm.openstreetmap:10.0.0.251
 
 3shenron.openstreetmap:200141c800100996021d7dfffec3df70
 +shenron.bm.openstreetmap:10.0.0.251
 
 3shenron.openstreetmap:200141c800100996021d7dfffec3df70


@@ -183,21 +227,25 @@
 3trac.openstreetmap:200141c800100996021d7dfffec3df70
 3help.openstreetmap:200141c800100996021d7dfffec3df70
 3shop.openstreetmap:200141c800100996021d7dfffec3df70
 3trac.openstreetmap:200141c800100996021d7dfffec3df70
 3help.openstreetmap:200141c800100996021d7dfffec3df70
 3shop.openstreetmap:200141c800100996021d7dfffec3df70

+3dns.openstreetmap:200141c800100996021d7dfffec3df70

 
 # 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
 

-# Tile cache server
+# Tile cache servers

 
 +orm.openstreetmap:193.63.75.98
 #+orm.ic.openstreetmap:10.0.16.2
 #+orm.oob.openstreetmap:10.0.17.2
 
 +orm.openstreetmap:193.63.75.98
 #+orm.ic.openstreetmap:10.0.16.2
 #+orm.oob.openstreetmap:10.0.17.2

++gorwen.openstreetmap:85.30.159.149
+3gorwen.openstreetmap:2a02008000003ff8020f20fffef66c09
++gorwen.oob.openstreetmap:85.30.129.101

 
 # Blog aggregator (on Shaun McDonald's VM)
 
 
 # Blog aggregator (on Shaun McDonald's VM)
 


@@ -213,7 +261,10 @@
 
 # HOT site
 
 
 # HOT site
 

-+hot.openstreetmap:69.163.129.108
++hot.openstreetmap:50.56.49.247
++humanitarian.openstreetmap:50.56.49.247
++hot-staging.openstreetmap:50.56.49.247
++hot-dev.openstreetmap:50.56.49.247

 
 # Jochen Topf's taginfo service, running on openstreetmap.de hardware
 
 
 # Jochen Topf's taginfo service, running on openstreetmap.de hardware