Move norbert's external IP to grindtooth

[dns.git] / src / openstreetmap

diff --git a/src/openstreetmap b/src/openstreetmap
index 61f17e8aad71dad9913e9a023a8026d2dd2df01a..028e031d7ce75a29181d8988b01fc177208243c3 100644 (file)
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -2,6 +2,9 @@
 #
 # Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
 
 #
 # Full reference is at http://cr.yp.to/djbdns/tinydns-data.html
 

+# Set SOA values with reduced TTL for negative cache entries
+Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300
+

 # Let Bytemark handle the DNS
 
 .openstreetmap::a.ns.bytemark.co.uk
 # Let Bytemark handle the DNS
 
 .openstreetmap::a.ns.bytemark.co.uk


@@ -11,7 +14,6 @@
 # Make the virtual machine the primary MX with Bytemark as backup
 
 @openstreetmap:89.16.179.150:a:10
 # Make the virtual machine the primary MX with Bytemark as backup
 
 @openstreetmap:89.16.179.150:a:10

-@openstreetmap::backup.mx.bytemark.co.uk:20

 @noreply.openstreetmap::a.mx.openstreetmap:10
 @otrs.openstreetmap::a.mx.openstreetmap:10
 @messages.openstreetmap::a.mx.openstreetmap:10
 @noreply.openstreetmap::a.mx.openstreetmap:10
 @otrs.openstreetmap::a.mx.openstreetmap:10
 @messages.openstreetmap::a.mx.openstreetmap:10


@@ -24,19 +26,29 @@
 
 # Delegate geo.openstreetmap.org to PowerDNS
 
 
 # Delegate geo.openstreetmap.org to PowerDNS
 

-&geo.openstreetmap:89.16.179.150:a.ns.openstreetmap:3600
-&geo.openstreetmap:193.63.75.98:b.ns.openstreetmap:3600
-&geo.openstreetmap:85.30.190.241:c.ns.openstreetmap:3600
+# shenron.openstreetmap.org
+&geo.openstreetmap:89.16.179.150:a.ns.openstreetmap
+# nadder-02.openstreetmap.org
+&geo.openstreetmap:192.163.219.40:b.ns.openstreetmap
+# fume.openstreetmap.org
+&geo.openstreetmap:85.30.190.241:c.ns.openstreetmap
+# bunyip.openstreetmap.org
+&geo.openstreetmap:203.26.72.12:d.ns.openstreetmap

 
 # Main web servers and their aliases
 
 +spike-01.openstreetmap:193.63.75.99
 3spike-01.openstreetmap:2001063000120500021a4bfffea5fd2a
 +openstreetmap:193.63.75.99:600
 
 # Main web servers and their aliases
 
 +spike-01.openstreetmap:193.63.75.99
 3spike-01.openstreetmap:2001063000120500021a4bfffea5fd2a
 +openstreetmap:193.63.75.99:600

+3openstreetmap:2001063000120500021a4bfffea5fd2a:600

 +www.openstreetmap:193.63.75.99:600
 +www.openstreetmap:193.63.75.99:600

+3www.openstreetmap:2001063000120500021a4bfffea5fd2a:600

 +api.openstreetmap:193.63.75.99:600
 +api.openstreetmap:193.63.75.99:600

+3api.openstreetmap:2001063000120500021a4bfffea5fd2a:600

 +maps.openstreetmap:193.63.75.99:600
 +maps.openstreetmap:193.63.75.99:600

+3maps.openstreetmap:2001063000120500021a4bfffea5fd2a:600

 +mapz.openstreetmap:193.63.75.99:600
 +mapz.openstreetmap:193.63.75.99:600

+3mapz.openstreetmap:2001063000120500021a4bfffea5fd2a:600

 +spike-01.ic.openstreetmap:146.179.159.162
 +www.ic.openstreetmap:146.179.159.162:3600
 +spike-01.oob.openstreetmap:146.179.159.188
 +spike-01.ic.openstreetmap:146.179.159.162
 +www.ic.openstreetmap:146.179.159.162:3600
 +spike-01.oob.openstreetmap:146.179.159.188


@@ -44,10 +56,15 @@
 +spike-02.openstreetmap:193.63.75.100
 3spike-02.openstreetmap:20010630001205000219bbfffe393d9e
 +openstreetmap:193.63.75.100:600
 +spike-02.openstreetmap:193.63.75.100
 3spike-02.openstreetmap:20010630001205000219bbfffe393d9e
 +openstreetmap:193.63.75.100:600

+3openstreetmap:20010630001205000219bbfffe393d9e:600

 +www.openstreetmap:193.63.75.100:600
 +www.openstreetmap:193.63.75.100:600

+3www.openstreetmap:20010630001205000219bbfffe393d9e:600

 +api.openstreetmap:193.63.75.100:600
 +api.openstreetmap:193.63.75.100:600

+3api.openstreetmap:20010630001205000219bbfffe393d9e:600

 +maps.openstreetmap:193.63.75.100:600
 +maps.openstreetmap:193.63.75.100:600

+3maps.openstreetmap:20010630001205000219bbfffe393d9e:600

 +mapz.openstreetmap:193.63.75.100:600
 +mapz.openstreetmap:193.63.75.100:600

+3mapz.openstreetmap:20010630001205000219bbfffe393d9e:600

 +spike-02.ic.openstreetmap:146.179.159.163
 +www.ic.openstreetmap:146.179.159.163:3600
 +spike-02.oob.openstreetmap:146.179.159.180
 +spike-02.ic.openstreetmap:146.179.159.163
 +www.ic.openstreetmap:146.179.159.163:3600
 +spike-02.oob.openstreetmap:146.179.159.180


@@ -55,10 +72,15 @@
 +spike-03.openstreetmap:193.63.75.103
 3spike-03.openstreetmap:20010630001205000219bbfffe398aba
 +openstreetmap:193.63.75.103:600
 +spike-03.openstreetmap:193.63.75.103
 3spike-03.openstreetmap:20010630001205000219bbfffe398aba
 +openstreetmap:193.63.75.103:600

+3openstreetmap:20010630001205000219bbfffe398aba:600

 +www.openstreetmap:193.63.75.103:600
 +www.openstreetmap:193.63.75.103:600

+3www.openstreetmap:20010630001205000219bbfffe398aba:600

 +api.openstreetmap:193.63.75.103:600
 +api.openstreetmap:193.63.75.103:600

+3api.openstreetmap:20010630001205000219bbfffe398aba:600

 +maps.openstreetmap:193.63.75.103:600
 +maps.openstreetmap:193.63.75.103:600

+3maps.openstreetmap:20010630001205000219bbfffe398aba:600

 +mapz.openstreetmap:193.63.75.103:600
 +mapz.openstreetmap:193.63.75.103:600

+3mapz.openstreetmap:20010630001205000219bbfffe398aba:600

 +spike-03.ic.openstreetmap:146.179.159.171
 +www.ic.openstreetmap:146.179.159.171:3600
 +spike-03.oob.openstreetmap:146.179.159.187
 +spike-03.ic.openstreetmap:146.179.159.171
 +www.ic.openstreetmap:146.179.159.171:3600
 +spike-03.oob.openstreetmap:146.179.159.187


@@ -86,58 +108,56 @@
 
 # JXAPI server
 
 
 # JXAPI server
 

-+norbert.openstreetmap:128.40.168.100
-+jxapi.openstreetmap:128.40.168.100
-+norbert.ilo.openstreetmap:10.0.0.55
++jxapi.openstreetmap:128.40.168.108:600

 +norbert.ucl.openstreetmap:10.0.0.5
 +norbert.oob.openstreetmap:10.0.1.5
 
 # OWL server
 
 +zark.openstreetmap:128.40.168.107
 +norbert.ucl.openstreetmap:10.0.0.5
 +norbert.oob.openstreetmap:10.0.1.5
 
 # OWL server
 
 +zark.openstreetmap:128.40.168.107

-+owl.openstreetmap:128.40.168107
++owl.openstreetmap:128.40.168.107

 +zark.ucl.openstreetmap:10.0.0.8
 +zark.oob.openstreetmap:10.0.1.8
 
 +zark.ucl.openstreetmap:10.0.0.8
 +zark.oob.openstreetmap:10.0.1.8
 

+# Taginfo server
+
++grindtooth.openstreetmap:128.40.168.100
++taginfo.openstreetmap:128.40.168.100
++grindtooth.ucl.openstreetmap:10.0.0.19
++grindtooth.oob.openstreetmap:10.0.1.19
+

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

++orm.openstreetmap:193.63.75.98
+3orm.openstreetmap:200106300012050002e081fffec52a8c
+#+orm.ic.openstreetmap:10.0.16.2
++orm.oob.openstreetmap:146.179.159.175

 +yevaud.openstreetmap:128.40.168.104
 +yevaud.openstreetmap:128.40.168.104

-Ctile.openstreetmap:tile.geo.openstreetmap.org:600
-Ca.tile.openstreetmap:tile.geo.openstreetmap.org:600
-Cb.tile.openstreetmap:tile.geo.openstreetmap.org:600
-Cc.tile.openstreetmap:tile.geo.openstreetmap.org: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.190.241:3600
-# remove IPv6 until we have IPv6 capable squid
-# 3sjobo.tile.openstreetmap:2a02008000003ff8022264fffe2a2714:3600
-+moscow.tile.openstreetmap:130.193.62.73:3600
-+brisbane.tile.openstreetmap:203.26.72.12:3600
-# remove IPv6 until we have IPv6 capable squid
-# 3brisbane.tile.openstreetmap:2402640000010006021708fffe5640c3:3600
+Ctile.openstreetmap:tile.geo.openstreetmap.org
+Ca.tile.openstreetmap:tile.geo.openstreetmap.org
+Cb.tile.openstreetmap:tile.geo.openstreetmap.org
+Cc.tile.openstreetmap:tile.geo.openstreetmap.org
+Cparent.tile.openstreetmap:render.openstreetmap.org

 
 # Services machine
 
 
 # Services machine
 

-+horntail.openstreetmap:193.63.75.101
-3horntail.openstreetmap:20010630001205000202b3fffeeceeac
-+planet.openstreetmap:193.63.75.101
-3planet.openstreetmap:20010630001205000202b3fffeeceeac
-+stats.openstreetmap:193.63.75.101
-3stats.openstreetmap:20010630001205000202b3fffeeceeac
-+chef.openstreetmap:193.63.75.101
-3chef.openstreetmap:20010630001205000202b3fffeeceeac
-+backup.openstreetmap:193.63.75.101
-3backup.openstreetmap:20010630001205000202b3fffeeceeac
-+horntail.ic.openstreetmap:146.179.159.164
-+backup.ic.openstreetmap:146.179.159.164
-+horntail.oob.openstreetmap:146.179.159.186
-
-# Database server
++ironbelly.openstreetmap:193.63.75.107
+3ironbelly.openstreetmap:2001063000120500022590fffec4f6ef
++chef.openstreetmap:193.63.75.107
+3chef.openstreetmap:2001063000120500022590fffec4f6ef
++backup.openstreetmap:193.63.75.107
+3backup.openstreetmap:2001063000120500022590fffec4f6ef
++stats.openstreetmap:193.63.75.107
+3stats.openstreetmap:2001063000120500022590fffec4f6ef
++planet.openstreetmap:193.63.75.107
+3planet.openstreetmap:2001063000120500022590fffec4f6ef
++ironbelly.ic.openstreetmap:146.179.159.177
++ironbelly.oob.openstreetmap:146.179.159.176
++backup.ic.openstreetmap:146.179.159.177
+
+# Database servers

 
 +smaug.ic.openstreetmap:146.179.159.168
 +smaug.oob.openstreetmap:146.179.159.182
 
 +smaug.ic.openstreetmap:146.179.159.168
 +smaug.oob.openstreetmap:146.179.159.182


@@ -146,6 +166,9 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 +db.ic.openstreetmap:146.179.159.170:600
 +ramoth.oob.openstreetmap:146.179.159.181
 
 +db.ic.openstreetmap:146.179.159.170:600
 +ramoth.oob.openstreetmap:146.179.159.181
 

++katla.ic.openstreetmap:146.179.159.173
++katla.oob.openstreetmap:146.179.159.174
+

 # Development server with wildcard alias for user sites
 
 +errol.openstreetmap:128.40.168.103
 # Development server with wildcard alias for user sites
 
 +errol.openstreetmap:128.40.168.103


@@ -207,10 +230,24 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 +sarel.ucl.openstreetmap:10.0.0.12
 +sarel.oob.openstreetmap:10.0.1.12
 
 +sarel.ucl.openstreetmap:10.0.0.12
 +sarel.oob.openstreetmap:10.0.1.12
 

+# Forum server
+
++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.168.105
++ascalon.ucl.openstreetmap:10.0.0.18
++ascalon.oob.openstreetmap:10.0.1.18
+

 # Spare machines
 
 +puff.ucl.openstreetmap:10.0.0.10
 +puff.oob.openstreetmap:10.0.1.10
 # Spare machines
 
 +puff.ucl.openstreetmap:10.0.0.10
 +puff.oob.openstreetmap:10.0.1.10

++idris.ucl.openstreetmap:10.0.0.4
++idris.oob.openstreetmap:10.0.1.4

 
 # APC power switches
 
 
 # APC power switches
 


@@ -225,7 +262,7 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 
 # Forum server
 
 
 # Forum server
 

-+forum.openstreetmap:93.186.179.231
++forum.openstreetmap:93.186.179.231:600

 
 # Bytemark machine, and the services which operate from it
 
 
 # Bytemark machine, and the services which operate from it
 


@@ -253,51 +290,74 @@ Cc.tile.openstreetmap:tile.geo.openstreetmap.org:600
 
 # Wiki server
 
 
 # Wiki server
 

-+konqi.openstreetmap:193.63.75.104
-3konqi.openstreetmap:2001063000120500021560fffeaa9956
-+konqi.ilo.openstreetmap:146.179.159.179
-+wiki.openstreetmap:193.63.75.104
-+dump.wiki.openstreetmap:193.63.75.104
-#+konqi.ic.openstreetmap:10.0.16.1
-#+konqi.oob.openstreetmap:10.0.17.1
++ouroboros.openstreetmap:193.63.75.106
+3ouroboros.openstreetmap:200106300012050002237dfffeea813a
++wiki.openstreetmap:193.63.75.106:600
++ouroboros.ic.openstreetmap:146.179.159.172
++ouroboros.oob.openstreetmap:146.179.159.178
+
+# GPS tile server
+
++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

 
 # Tile cache servers
 
 
 # Tile cache servers
 

-+orm.openstreetmap:193.63.75.98
-3orm.openstreetmap:200106300012050002e081fffec52a8c
-#+orm.ic.openstreetmap:10.0.16.2
-#+orm.oob.openstreetmap:10.0.17.2

 +fume.openstreetmap:85.30.190.241
 3fume.openstreetmap:2a02008000003ff8022264fffe2a2714
 +fume.oob.openstreetmap:85.30.129.98
 +gorynych.openstreetmap:130.193.62.73
 +bunyip.openstreetmap:203.26.72.12
 3bunyip.openstreetmap:2402640000010006021708fffe5640c3
 +fume.openstreetmap:85.30.190.241
 3fume.openstreetmap:2a02008000003ff8022264fffe2a2714
 +fume.oob.openstreetmap:85.30.129.98
 +gorynych.openstreetmap:130.193.62.73
 +bunyip.openstreetmap:203.26.72.12
 3bunyip.openstreetmap:2402640000010006021708fffe5640c3

++lurien.openstreetmap:193.55.222.229
++trogdor.openstreetmap:134.90.146.26
++trogdor.oob.openstreetmap:134.90.146.30
++ridgeback.openstreetmap:31.169.50.10
++ridgeback.oob.openstreetmap:31.169.50.14
++jakelong.openstreetmap:64.62.205.202
+3jakelong.openstreetmap:2001047000010041a80000fffe3ecdca
++nepomuk.openstreetmap:77.95.70.166
+3nepomuk.openstreetmap:2a0391800001002100000000000000a6
++simurgh.openstreetmap:94.20.20.55
+
++tabaluga.openstreetmap:5.9.150.236
+3tabaluga.openstreetmap:2a0104f8019033eb0000000000000002
++nadder-01.openstreetmap:192.163.219.36
++nadder-02.openstreetmap:192.163.219.40

 
 # Blog aggregator (on Shaun McDonald's VM)
 
 +blogs.openstreetmap:89.16.175.12
 
 
 # Blog aggregator (on Shaun McDonald's VM)
 
 +blogs.openstreetmap:89.16.175.12
 

-# Cruise (on Shaun McDonald's VM)
+# Continuous integration server (on Shaun McDonald's machine)

 
 

-+cruise.openstreetmap:89.16.175.12
++ci.openstreetmap:144.76.98.136
++cruise.openstreetmap:144.76.98.136

  
 # Donation site
 
  
 # Donation site
 

-+donate.openstreetmap:89.145.67.86:600
++donate.openstreetmap:46.43.50.94:600

 
 # DMCA Notice site
 
 
 # DMCA Notice site
 

-+dmca.openstreetmap:89.145.67.86:600
++dmca.openstreetmap:46.43.50.94:600

 
 # HOT site
 
 
 # HOT site
 

-+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
++hot.openstreetmap:144.76.31.210
++humanitarian.openstreetmap:144.76.31.210
++hot-staging.openstreetmap:144.76.31.210
++hot-dev.openstreetmap:144.76.31.210

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

-+taginfo.openstreetmap:85.214.118.227
-3taginfo.openstreetmap:2a0102384000000003cac7808a7d7be2
++taginfo.openstreetmap:85.214.112.59:600
+3taginfo.openstreetmap:2a01023840000000002168799ac19e7e:600