X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/b2062c65169da682b653654ac36323773486c6e4..324f0ad4aae1f6fbb0070d7484dd63417f043f7b:/src/openstreetmap?ds=sidebyside

diff --git a/src/openstreetmap b/src/openstreetmap
index 60ffc92..2ea2db6 100644
--- a/src/openstreetmap
+++ b/src/openstreetmap
@@ -2,6 +2,9 @@
 #
 # 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
@@ -10,8 +13,8 @@
 
 # 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
+@openstreetmap:89.16.179.150:a:10:600
+@noreply.openstreetmap::a.mx.openstreetmap:10
 @otrs.openstreetmap::a.mx.openstreetmap:10
 @messages.openstreetmap::a.mx.openstreetmap:10
 
@@ -19,199 +22,352 @@
 
 # Publish an SPF record indicating that only shenron sends mail
 
-'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 ip4\072212.110.172.32 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ~all
+
+# Delegate geo.openstreetmap.org to PowerDNS
+
+# shenron.openstreetmap.org
+&geo.openstreetmap:89.16.179.150:a.ns.openstreetmap:600
+# 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
 
 # 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.internal.openstreetmap:10.0.0.8
-+puff.ilo.openstreetmap:10.0.0.58
-
-+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.internal.openstreetmap:10.0.0.9
-+fuchur.ilo.openstreetmap:10.0.0.59
++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
+3www.openstreetmap:2001063000120500021a4bfffea5fd2a:600
++api.openstreetmap:193.63.75.99:600
+3api.openstreetmap:2001063000120500021a4bfffea5fd2a:600
++maps.openstreetmap:193.63.75.99:600
+3maps.openstreetmap:2001063000120500021a4bfffea5fd2a: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-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
+3www.openstreetmap:20010630001205000219bbfffe393d9e:600
++api.openstreetmap:193.63.75.100:600
+3api.openstreetmap:20010630001205000219bbfffe393d9e:600
++maps.openstreetmap:193.63.75.100:600
+3maps.openstreetmap:20010630001205000219bbfffe393d9e: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-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
+3www.openstreetmap:20010630001205000219bbfffe398aba:600
++api.openstreetmap:193.63.75.103:600
+3api.openstreetmap:20010630001205000219bbfffe398aba:600
++maps.openstreetmap:193.63.75.103:600
+3maps.openstreetmap:20010630001205000219bbfffe398aba: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
 
 # Rails application servers
 
-+draco.internal.openstreetmap:10.0.0.10
-+rails1.internal.openstreetmap:10.0.0.10
-+draco.ilo.openstreetmap:10.0.0.60
-+sarel.internal.openstreetmap:10.0.0.11
-+rails2.internal.openstreetmap:10.0.0.11
-+sarel.ilo.openstreetmap:10.0.0.61
-+norbert.internal.openstreetmap:10.0.0.12
-+rails3.internal.openstreetmap:10.0.0.12
-+norbert.ilo.openstreetmap:10.0.0.62
++thorn-01.ic.openstreetmap:146.179.159.165
++rails1.ic.openstreetmap:146.179.159.165
++thorn-01.oob.openstreetmap:146.179.159.185
+
++thorn-02.ic.openstreetmap:146.179.159.166
++rails2.ic.openstreetmap:146.179.159.166
++thorn-02.oob.openstreetmap:146.179.159.184
 
-# Gazetteer (nominatim) server
++thorn-03.ic.openstreetmap:146.179.159.167
++rails3.ic.openstreetmap:146.179.159.167
++thorn-03.oob.openstreetmap:146.179.159.183
 
-+poldi.openstreetmap:128.40.168.106 
-+poldi.internal.openstreetmap:10.0.0.16
-+poldi.ilo.openstreetmap:10.0.0.66
-+nominatim.openstreetmap:128.40.168.106
+# Nominatim servers
 
-# Gazetteer (namefinder) server
++poldi.openstreetmap:128.40.45.203
++nominatim.openstreetmap:128.40.45.203:3600
++poldi.ucl.openstreetmap:10.0.0.16
++poldi.oob.openstreetmap:10.0.1.16
 
-+gazetteer.openstreetmap:128.40.168.96
-+gazetteer.internal.openstreetmap:10.0.0.1
++pummelzacken.openstreetmap:128.40.45.204
++pummelzacken.ucl.openstreetmap:10.0.0.20
++pummelzacken.oob.openstreetmap:10.0.1.20
 
-# XAPI server
+# JXAPI server
 
-+fafnir.openstreetmap:128.40.168.97
-+xapi.openstreetmap:128.40.168.97
-+fafnir.internal.openstreetmap:10.0.0.4
++norbert.openstreetmap:128.40.45.202
++jxapi.openstreetmap:128.40.45.202:600
++norbert.ucl.openstreetmap:10.0.0.5
++norbert.oob.openstreetmap:10.0.1.5
 
 # OWL server
 
-+albi.openstreetmap:128.40.168.95
-+owl.openstreetmap:128.40.168.95
-+albi.internal.openstreetmap:10.0.0.2
-+albi.ilo.openstreetmap:10.0.0.52
++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
 
-# Spare server
+# Taginfo server
 
-+azure.openstreetmap:128.40.168.100
-+jxapi.openstreetmap:128.40.168.100
-+azure.internal.openstreetmap:10.0.0.5
-+azure.ilo.openstreetmap:10.0.0.55
++grindtooth.openstreetmap:128.40.45.199
++taginfo.openstreetmap:128.40.45.199:600
++grindtooth.ucl.openstreetmap:10.0.0.19
++grindtooth.oob.openstreetmap:10.0.1.19
 
 # 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
-+yevaud.internal.openstreetmap:10.0.0.15
-+yevaud.ilo.openstreetmap:10.0.0.65
++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.45.208
++yevaud.ucl.openstreetmap:10.0.0.15
++yevaud.oob.openstreetmap:10.0.1.15
+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
 
-+horntail.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:10.0.0.7
-+horntail.internal.openstreetmap:10.0.0.7
-+horntail.ilo.openstreetmap:10.0.0.57
++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
+
++ramoth.ic.openstreetmap:146.179.159.170
++db.ic.openstreetmap:146.179.159.170:600
++ramoth.oob.openstreetmap:146.179.159.181
+
++katla.ic.openstreetmap:146.179.159.173
++db-slave.ic.openstreetmap:146.179.159.173:600
++katla.oob.openstreetmap:146.179.159.174
+
+# Development server with wildcard alias for user sites
 
-# Osmarender tile server, with wildcard alias to allow parallel loading
++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
 
-+tah.openstreetmap:129.132.168.206
-+a.tah.openstreetmap:129.132.168.206
-+b.tah.openstreetmap:129.132.168.206
-+c.tah.openstreetmap:129.132.168.206
-+d.tah.openstreetmap:129.132.168.206
-+e.tah.openstreetmap:129.132.168.206
-+f.tah.openstreetmap:129.132.168.206
-+server.tah.openstreetmap:129.132.168.206
+# Foundation server
 
-# Database server
++ridley.openstreetmap:128.40.45.205
++otrs.openstreetmap:128.40.45.205
++thinkup.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
 
-+smaug.internal.openstreetmap:10.0.0.13
-+db.internal.openstreetmap:10.0.0.13:60
-+smaug.ilo.internal.openstreetmap:10.0.0.63
+# Piwik server
 
-# Development server with wildcard alias for user sites
++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
 
-+errol.openstreetmap:128.40.168.103
-+dev.openstreetmap:128.40.168.103
-+*.dev.openstreetmap:128.40.168.103
-+ooc.openstreetmap:128.40.168.103
-+a.ooc.openstreetmap:128.40.168.103
-+b.ooc.openstreetmap:128.40.168.103
-+c.ooc.openstreetmap:128.40.168.103
-+npe.openstreetmap:128.40.168.103
-+os.openstreetmap:128.40.168.103
-+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
+# Imagery servers
 
-# Foundation server
++faffy.openstreetmap:128.40.45.198
++agri.openstreetmap:128.40.45.198:3600
++a.agri.openstreetmap:128.40.45.198:3600
++b.agri.openstreetmap:128.40.45.198:3600
++c.agri.openstreetmap:128.40.45.198:3600
++os.openstreetmap:128.40.45.198:3600
++a.os.openstreetmap:128.40.45.198:3600
++b.os.openstreetmap:128.40.45.198:3600
++c.os.openstreetmap:128.40.45.198:3600
++faffy.ucl.openstreetmap:10.0.0.7
++faffy.oob.openstreetmap:10.0.1.7
 
-+ridley.openstreetmap:128.40.168.102
-+otrs.openstreetmap:128.40.168.102
-+blog.openstreetmap:128.40.168.102
-+foundation.openstreetmap:128.40.168.102
-+ridley.internal.openstreetmap:10.0.0.3
++draco.openstreetmap:128.40.45.195 
++draco.ucl.openstreetmap:10.0.0.11
++draco.oob.openstreetmap:10.0.1.11
 
-# Planet dumps are currently served from horntail
+# Munin server
 
-+planet.openstreetmap:128.40.168.99
++urmel.openstreetmap:128.40.45.207
++munin.openstreetmap:128.40.45.207:600
++urmel.ucl.openstreetmap:10.0.0.6
++urmel.oob.openstreetmap:10.0.1.6
 
-# APC power switch
+# Gosmore routing server
 
-+apc1.internal.openstreetmap:10.0.0.49
-+apc2.internal.openstreetmap:10.0.0.50
-+apc3.internal.openstreetmap:10.0.0.51
++sarel.openstreetmap:128.40.45.206
++sarel.ucl.openstreetmap:10.0.0.12
++sarel.oob.openstreetmap:10.0.1.12
 
 # Forum server
 
-+forum.openstreetmap:93.186.179.231
++clifford.openstreetmap:128.40.45.194
++clifford.ucl.openstreetmap:10.0.0.17
++clifford.oob.openstreetmap:10.0.1.17
 
-# Bytemark machine, and the services which operate from it
+# Loan machine for emacsen
 
-+shenron.openstreetmap:89.16.179.150
-+mail.openstreetmap:89.16.179.150
-+lists.openstreetmap:89.16.179.150
-+svn.openstreetmap:89.16.179.150
-+git.openstreetmap:89.16.179.150
-+trac.openstreetmap:89.16.179.150
-+irc.openstreetmap:89.16.179.150
-+help.openstreetmap:89.16.179.150
-+shop.openstreetmap:89.16.179.150
-+shenron.internal.openstreetmap:10.0.0.251
-
-3shenron.openstreetmap:200141c800100996021d7dfffec3df70
-3mail.openstreetmap:200141c800100996021d7dfffec3df70
-3lists.openstreetmap:200141c800100996021d7dfffec3df70
-3svn.openstreetmap:200141c800100996021d7dfffec3df70
-3git.openstreetmap:200141c800100996021d7dfffec3df70
-3trac.openstreetmap:200141c800100996021d7dfffec3df70
-3help.openstreetmap:200141c800100996021d7dfffec3df70
-3shop.openstreetmap:200141c800100996021d7dfffec3df70
++ascalon.openstreetmap:128.40.45.193
++ascalon.ucl.openstreetmap:10.0.0.18
++ascalon.oob.openstreetmap:10.0.1.18
 
-# Wiki server
+# Spare machines
 
-+konqi.openstreetmap:193.63.75.26
-+konqi.ilo.openstreetmap:193.63.75.27
-+konqi.internal.openstreetmap:10.0.0.252
-+wiki.openstreetmap:193.63.75.26
-+dump.wiki.openstreetmap:193.63.75.26
++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
 
-# Tile cache server
+# APC power switches
 
-+orm.openstreetmap:193.63.75.98
++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:46.19.218.68:600
+
+# Bytemark machine, and the services which operate from it
+
++shenron.openstreetmap:89.16.179.150:600
++mail.openstreetmap:89.16.179.150:600
++lists.openstreetmap:89.16.179.150:600
++svn.openstreetmap:89.16.179.150:600
++git.openstreetmap:89.16.179.150:600
++trac.openstreetmap:89.16.179.150:600
++irc.openstreetmap:89.16.179.150:600
++help.openstreetmap:89.16.179.150:600
++shop.openstreetmap:89.16.179.150:600
++dns.openstreetmap:89.16.179.150:600
++shenron.bm.openstreetmap:10.0.16.3
+
+3shenron.openstreetmap:200141c800100996021d7dfffec3df70:600
+3mail.openstreetmap:200141c800100996021d7dfffec3df70:600
+3lists.openstreetmap:200141c800100996021d7dfffec3df70:600
+3svn.openstreetmap:200141c800100996021d7dfffec3df70:600
+3git.openstreetmap:200141c800100996021d7dfffec3df70:600
+3trac.openstreetmap:200141c800100996021d7dfffec3df70:600
+3help.openstreetmap:200141c800100996021d7dfffec3df70:600
+3shop.openstreetmap:200141c800100996021d7dfffec3df70:600
+3dns.openstreetmap:200141c800100996021d7dfffec3df70:600
+
+# Wiki server
+
++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.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
+
+# Tile cache servers
+
++fume.openstreetmap:85.30.190.241
+3fume.openstreetmap:2a02008000003ff8022264fffe2a2714
++fume.oob.openstreetmap:85.30.129.98
++gorynych.openstreetmap:130.193.62.73
++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
++longma.openstreetmap:140.110.240.7
+3longma.openstreetmap:20010e10200002400000000000000007
 
 # 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
 
-+donate.openstreetmap:89.145.67.86
++donate.openstreetmap:46.43.50.94:600
+
+# DMCA Notice site
+
++dmca.openstreetmap:46.43.50.94:600
 
 # HOT site
 
-+hot.openstreetmap:69.163.129.108
++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
 
-+taginfo.openstreetmap:85.214.118.227
-3taginfo.openstreetmap:2a0102384000000003cac7808a7d7be2
+#+taginfo.openstreetmap:85.214.112.59:600
+#3taginfo.openstreetmap:2a01023840000000002168799ac19e7e:600
+
+# OSUOSL machines
+
++stormfly-01.openstreetmap:140.211.167.104
++stormfly-01.oob.openstreetmap:10.0.0.99
++stormfly-02.openstreetmap:140.211.167.105
++stormfly-02.oob.openstreetmap:10.0.0.108