X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/013541705c0f764f8da3de53278dd3c24a46e7b6..dd7f10c419231499f3af418664ad47627e11cf80:/src/openstreetmap diff --git a/src/openstreetmap b/src/openstreetmap index cda8736..70d53ad 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -14,7 +14,6 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300 # 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 @@ -33,39 +32,37 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300 &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 -#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 ++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 ++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 @@ -100,18 +97,20 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300 +rails3.ic.openstreetmap:146.179.159.167 +thorn-03.oob.openstreetmap:146.179.159.183 -# Nominatim server +# Nominatim servers +poldi.openstreetmap:128.40.168.106 +nominatim.openstreetmap:128.40.168.106:3600 +poldi.ucl.openstreetmap:10.0.0.16 +poldi.oob.openstreetmap:10.0.1.16 ++pummelzacken.openstreetmap:128.40.168.105 ++pummelzacken.ucl.openstreetmap:10.0.0.20 ++pummelzacken.oob.openstreetmap:10.0.1.20 + # 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 @@ -122,6 +121,13 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300 +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: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 +orm.openstreetmap:193.63.75.98 @@ -139,11 +145,6 @@ Cparent.tile.openstreetmap:render.openstreetmap.org # Services machine -+horntail.openstreetmap:193.63.75.101 -3horntail.openstreetmap:20010630001205000202b3fffeeceeac -+horntail.ic.openstreetmap:146.179.159.164 -+horntail.oob.openstreetmap:146.179.159.186 - +ironbelly.openstreetmap:193.63.75.107 3ironbelly.openstreetmap:2001063000120500022590fffec4f6ef +chef.openstreetmap:193.63.75.107 @@ -158,7 +159,7 @@ Cparent.tile.openstreetmap:render.openstreetmap.org +ironbelly.oob.openstreetmap:146.179.159.176 +backup.ic.openstreetmap:146.179.159.177 -# Database server +# Database servers +smaug.ic.openstreetmap:146.179.159.168 +smaug.oob.openstreetmap:146.179.159.182 @@ -231,11 +232,21 @@ Cparent.tile.openstreetmap:render.openstreetmap.org +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.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 -+idris.openstreetmap:128.40.168.98 +idris.ucl.openstreetmap:10.0.0.4 +idris.oob.openstreetmap:10.0.1.4 @@ -252,7 +263,7 @@ Cparent.tile.openstreetmap:render.openstreetmap.org # Forum server -+forum.openstreetmap:93.186.179.231 ++forum.openstreetmap:46.19.218.68:600 # Bytemark machine, and the services which operate from it @@ -280,41 +291,47 @@ Cparent.tile.openstreetmap:render.openstreetmap.org # Wiki server -+konqi.openstreetmap:193.63.75.104 -3konqi.openstreetmap:2001063000120500021560fffeaa9956 -+konqi.ilo.openstreetmap:146.179.159.179 -+wiki.openstreetmap:193.63.75.106:600 -+dump.wiki.openstreetmap:193.63.75.104:600 -#+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 +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:200107f80047002100000000000000a6 -+grisu.openstreetmap:142.4.213.166 -3grisu.openstreetmap:26075300006012a60000000000000001 +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) @@ -327,20 +344,20 @@ Cparent.tile.openstreetmap:render.openstreetmap.org # Donation site -+donate.openstreetmap:89.145.67.86:600 ++donate.openstreetmap:46.43.50.94:600 # DMCA Notice site -+dmca.openstreetmap:89.145.67.86:600 ++dmca.openstreetmap:46.43.50.94:600 # 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 -+taginfo.openstreetmap:85.214.112.59 -3taginfo.openstreetmap:2a01023840000000002168799ac19e7e +#+taginfo.openstreetmap:85.214.112.59:600 +#3taginfo.openstreetmap:2a01023840000000002168799ac19e7e:600