X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/88372b83ac3841675f8fcded36ef59e2a8d20dab..6c6c2af0d815cd446dab89a537f225ada71991ba:/src/openstreetmap?ds=sidebyside diff --git a/src/openstreetmap b/src/openstreetmap index 0705a55..8e6ff0c 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -13,7 +13,7 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300 # Make the virtual machine the primary MX with Bytemark as backup -@openstreetmap:212.110.172.32:a:10:600 +@openstreetmap:212.110.172.32:a:10 @noreply.openstreetmap::a.mx.openstreetmap:10 @otrs.openstreetmap::a.mx.openstreetmap:10 @messages.openstreetmap::a.mx.openstreetmap:10 @@ -24,14 +24,24 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300 'openstreetmap:v=spf1 ip4\07289.16.179.150 ip4\072212.110.172.32 ip6\0722001\07241c8\07210\072996\07221d\0727dff\072fec3\072df70 ip6\0722001\07241c9\0721\072400\072\07232 ~all +# Add Google Postmaster Tools Verification +# Grant +Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com + # Delegate geo.openstreetmap.org to PowerDNS # shenron.openstreetmap.org -&geo.openstreetmap:212.110.172.32: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 +&geo.openstreetmap:212.110.172.32:a.ns.openstreetmap +# saphira.openstreetmap.org +&geo.openstreetmap:185.73.44.30:b.ns.openstreetmap +# ridgeback.openstreetmap.org +&geo.openstreetmap:31.169.50.10:c.ns.openstreetmap +# jakelong.openstreetmap.org +&geo.openstreetmap:64.62.205.202:d.ns.openstreetmap +# katie.openstreetmap.org +&geo.openstreetmap:144.76.70.77:e.ns.openstreetmap +# stormfly-02.openstreetmap.org +&geo.openstreetmap:140.211.167.105:f.ns.openstreetmap # Main web servers and their aliases @@ -47,9 +57,9 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300 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-01.ic.openstreetmap:146.179.159.162:600 ++www.ic.openstreetmap:146.179.159.162:600 ++spike-01.oob.openstreetmap:146.179.159.188:600 +spike-02.openstreetmap:193.63.75.100 3spike-02.openstreetmap:20010630001205000219bbfffe393d9e @@ -63,9 +73,9 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300 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-02.ic.openstreetmap:146.179.159.163:600 ++www.ic.openstreetmap:146.179.159.163:600 ++spike-02.oob.openstreetmap:146.179.159.180:600 +spike-03.openstreetmap:193.63.75.103 3spike-03.openstreetmap:20010630001205000219bbfffe398aba @@ -79,36 +89,85 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300 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 ++spike-03.ic.openstreetmap:146.179.159.171:600 ++www.ic.openstreetmap:146.179.159.171:600 ++spike-03.oob.openstreetmap:146.179.159.187:600 + ++spike-04.openstreetmap:89.16.162.21 +3spike-04.openstreetmap:200141c9000200d60000000000000021 +#+openstreetmap:89.16.162.21:600 +#3openstreetmap:200141c9000200d60000000000000021:600 +#+www.openstreetmap:89.16.162.21:600 +#3www.openstreetmap:200141c9000200d60000000000000021:600 +#+api.openstreetmap:89.16.162.21:600 +#3api.openstreetmap:200141c9000200d60000000000000021:600 +#+maps.openstreetmap:89.16.162.21:600 +#3maps.openstreetmap:200141c9000200d60000000000000021:600 +#+mapz.openstreetmap:89.16.162.21:600 +#3mapz.openstreetmap:200141c9000200d60000000000000021:600 ++spike-04.bm.openstreetmap:10.0.32.21 ++www.bm.openstreetmap:10.0.32.21:600 ++spike-04.oob.openstreetmap:10.0.33.21 + ++spike-05.openstreetmap:89.16.162.22 +3spike-05.openstreetmap:200141c9000200d60000000000000022 +#+openstreetmap:89.16.162.22:600 +#3openstreetmap:200141c9000200d60000000000000022:600 +#+www.openstreetmap:89.16.162.22:600 +#3www.openstreetmap:200141c9000200d60000000000000022:600 +#+api.openstreetmap:89.16.162.22:600 +#3api.openstreetmap:200141c9000200d60000000000000022:600 +#+maps.openstreetmap:89.16.162.22:600 +#3maps.openstreetmap:200141c9000200d60000000000000022:600 +#+mapz.openstreetmap:89.16.162.22:600 +#3mapz.openstreetmap:200141c9000200d60000000000000022:600 ++spike-05.bm.openstreetmap:10.0.32.22 ++www.bm.openstreetmap:10.0.32.22:600 ++spike-05.oob.openstreetmap:10.0.33.22 # Rails application servers -+thorn-01.ic.openstreetmap:146.179.159.165 -+rails1.ic.openstreetmap:146.179.159.165 -+thorn-01.oob.openstreetmap:146.179.159.185 ++thorn-01.ic.openstreetmap:146.179.159.165:600 ++rails1.ic.openstreetmap:146.179.159.165:600 ++thorn-01.oob.openstreetmap:146.179.159.185:600 + ++thorn-02.ic.openstreetmap:146.179.159.166:600 ++rails2.ic.openstreetmap:146.179.159.166:600 ++thorn-02.oob.openstreetmap:146.179.159.184:600 + ++thorn-03.ic.openstreetmap:146.179.159.167:600 ++rails3.ic.openstreetmap:146.179.159.167:600 ++thorn-03.oob.openstreetmap:146.179.159.183:600 -+thorn-02.ic.openstreetmap:146.179.159.166 -+rails2.ic.openstreetmap:146.179.159.166 -+thorn-02.oob.openstreetmap:146.179.159.184 ++thorn-04.bm.openstreetmap:10.0.32.41 ++rails4.bm.openstreetmap:10.0.32.41 ++thorn-04.oob.openstreetmap:10.0.33.41 -+thorn-03.ic.openstreetmap:146.179.159.167 -+rails3.ic.openstreetmap:146.179.159.167 -+thorn-03.oob.openstreetmap:146.179.159.183 ++thorn-05.bm.openstreetmap:10.0.32.42 ++rails5.bm.openstreetmap:10.0.32.42 ++thorn-05.oob.openstreetmap:10.0.33.42 # Nominatim servers -+poldi.openstreetmap:128.40.45.203 -#+nominatim.openstreetmap:128.40.45.203:600 -+poldi.ucl.openstreetmap:10.0.0.16 -+poldi.oob.openstreetmap:10.0.1.16 ++poldi.openstreetmap:193.63.75.101 +3poldi.openstreetmap:200106300012050002e081fffec5333e +#+nominatim.openstreetmap:193.63.75.101:600 +#3nominatim.openstreetmap:200106300012050002e081fffec5333e:600 ++poldi.ic.openstreetmap:146.179.159.164:600 ++poldi.oob.openstreetmap:146.179.159.186:600 +pummelzacken.openstreetmap:128.40.45.204 -+nominatim.openstreetmap:128.40.45.204:600 +#+nominatim.openstreetmap:128.40.45.204:600 +pummelzacken.ucl.openstreetmap:10.0.0.20 +pummelzacken.oob.openstreetmap:10.0.1.20 ++dulcy.openstreetmap:193.63.75.109 +3dulcy.openstreetmap:20010630001205000ec47afffe6696d2 ++nominatim.openstreetmap:193.63.75.109:600 +3nominatim.openstreetmap:20010630001205000ec47afffe6696d2:600 ++dulcy.ic.openstreetmap:146.179.159.179:600 +#+dulcy.oob.openstreetmap: + # JXAPI server +norbert.openstreetmap:128.40.45.202 @@ -123,22 +182,28 @@ 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 +# Taginfo servers +grindtooth.openstreetmap:128.40.45.199 -+taginfo.openstreetmap:128.40.45.199:600 +#+taginfo.openstreetmap:128.40.45.199:600 +grindtooth.ucl.openstreetmap:10.0.0.19 +grindtooth.oob.openstreetmap:10.0.1.19 ++stormfly-01.openstreetmap:140.211.167.104 ++taginfo.openstreetmap:140.211.167.104:600 ++stormfly-01.oob.openstreetmap:10.0.0.99 + # 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 ++orm.oob.openstreetmap:146.179.159.175:600 +yevaud.openstreetmap:128.40.45.208 +yevaud.ucl.openstreetmap:10.0.0.15 +yevaud.oob.openstreetmap:10.0.1.15 ++vial.openstreetmap:138.201.195.31 +3vial.openstreetmap:2a0104f801723cde0000000000000002 Ctile.openstreetmap:tile.geo.openstreetmap.org Ca.tile.openstreetmap:tile.geo.openstreetmap.org Cb.tile.openstreetmap:tile.geo.openstreetmap.org @@ -155,24 +220,37 @@ Cparent.tile.openstreetmap:render.openstreetmap.org 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 ++planet.openstreetmap:193.63.75.107:600 +3planet.openstreetmap:2001063000120500022590fffec4f6ef:600 ++logstash.openstreetmap:193.63.75.107 +3logstash.openstreetmap:2001063000120500022590fffec4f6ef ++hardware.openstreetmap:193.63.75.107 +3hardware.openstreetmap:2001063000120500022590fffec4f6ef ++ironbelly.ic.openstreetmap:146.179.159.177:600 ++ironbelly.oob.openstreetmap:146.179.159.176:600 ++backup.ic.openstreetmap:146.179.159.177:600 + ++grisu.openstreetmap:89.16.162.20 +3grisu.openstreetmap:200141c9000200d60000000000000020 +#+planet.openstreetmap:89.16.162.20:600 +#3planet.openstreetmap:200141c9000200d60000000000000020:600 ++grisu.bm.openstreetmap:10.0.32.20 ++grisu.oob.openstreetmap:10.0.33.20 # Database servers -+smaug.ic.openstreetmap:146.179.159.168 -+smaug.oob.openstreetmap:146.179.159.182 ++karm.ic.openstreetmap:146.179.159.168:600 ++karm.oob.openstreetmap:146.179.159.173:600 + ++katla.bm.openstreetmap:10.0.32.40 ++db.openstreetmap:10.0.32.40:600 ++katla.oob.openstreetmap:10.0.33.40 -+katla.ic.openstreetmap:146.179.159.173 -+db.ic.openstreetmap:146.179.159.173:600 -+katla.oob.openstreetmap:146.179.159.174 ++ramoth.ic.openstreetmap:146.179.159.170:600 ++db-slave.openstreetmap:146.179.159.170:600 ++ramoth.oob.openstreetmap:146.179.159.181:600 -+ramoth.ic.openstreetmap:146.179.159.170 -+db-slave.ic.openstreetmap:146.179.159.170:600 -+ramoth.oob.openstreetmap:146.179.159.181 ++fafnir.openstreetmap:52.50.86.69 # Development server with wildcard alias for user sites @@ -191,7 +269,6 @@ Cparent.tile.openstreetmap:render.openstreetmap.org +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 @@ -206,24 +283,30 @@ Cparent.tile.openstreetmap:render.openstreetmap.org # Imagery servers -+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 -#Ugly hack to use draco -+os.openstreetmap:128.40.45.195:3600 -+a.os.openstreetmap:128.40.45.195:3600 -+b.os.openstreetmap:128.40.45.195:3600 -+c.os.openstreetmap:128.40.45.195:3600 -+faffy.ucl.openstreetmap:10.0.0.7 -+faffy.oob.openstreetmap:10.0.1.7 - -+draco.openstreetmap:128.40.45.195 ++draco.openstreetmap:128.40.45.195 +draco.ucl.openstreetmap:10.0.0.11 +draco.oob.openstreetmap:10.0.1.11 ++kessie.openstreetmap:178.250.74.36 +3kessie.openstreetmap:2a02165800040000dad385fffe5d875e ++agri.openstreetmap:178.250.74.36:3600 +3agri.openstreetmap:2a02165800040000dad385fffe5d875e:3600 ++a.agri.openstreetmap:178.250.74.36:3600 +3a.agri.openstreetmap:2a02165800040000dad385fffe5d875e:3600 ++b.agri.openstreetmap:178.250.74.36:3600 +3b.agri.openstreetmap:2a02165800040000dad385fffe5d875e:3600 ++c.agri.openstreetmap:178.250.74.36:3600 +3c.agri.openstreetmap:2a02165800040000dad385fffe5d875e:3600 ++os.openstreetmap:178.250.74.36:3600 +3os.openstreetmap:2a02165800040000dad385fffe5d875e:3600 ++a.os.openstreetmap:178.250.74.36:3600 +3a.os.openstreetmap:2a02165800040000dad385fffe5d875e:3600 ++b.os.openstreetmap:178.250.74.36:3600 +3b.os.openstreetmap:2a02165800040000dad385fffe5d875e:3600 ++c.os.openstreetmap:178.250.74.36:3600 +3c.os.openstreetmap:2a02165800040000dad385fffe5d875e:3600 ++kessie.oob.openstreetmap:178.250.74.37 + # Munin server +urmel.openstreetmap:128.40.45.207 @@ -256,6 +339,10 @@ Cparent.tile.openstreetmap:render.openstreetmap.org +idris.ucl.openstreetmap:10.0.0.4 +idris.oob.openstreetmap:10.0.1.4 +# KVMs + ++kvm1.ucl.openstreetmap:10.0.0.21 + # APC power switches +apc1.ucl.openstreetmap:10.0.0.49 @@ -265,7 +352,7 @@ Cparent.tile.openstreetmap:render.openstreetmap.org # Managed network switches +switch1.openstreetmap:193.63.75.102 -+switch2.ic.openstreetmap:146.179.159.169 ++switch2.ic.openstreetmap:146.179.159.169:600 # Forum server @@ -273,35 +360,35 @@ Cparent.tile.openstreetmap:render.openstreetmap.org # Bytemark machine, and the services which operate from it -+shenron.openstreetmap:212.110.172.32:600 -+mail.openstreetmap:212.110.172.32:600 -+lists.openstreetmap:212.110.172.32:600 -+svn.openstreetmap:212.110.172.32:600 -+git.openstreetmap:212.110.172.32:600 -+trac.openstreetmap:212.110.172.32:600 -+irc.openstreetmap:212.110.172.32:600 -+help.openstreetmap:212.110.172.32:600 -+shop.openstreetmap:212.110.172.32:600 -+dns.openstreetmap:212.110.172.32:600 ++shenron.openstreetmap:212.110.172.32 ++mail.openstreetmap:212.110.172.32 ++lists.openstreetmap:212.110.172.32 ++svn.openstreetmap:212.110.172.32 ++git.openstreetmap:212.110.172.32 ++trac.openstreetmap:212.110.172.32 ++irc.openstreetmap:212.110.172.32 ++help.openstreetmap:212.110.172.32 ++shop.openstreetmap:212.110.172.32 ++dns.openstreetmap:212.110.172.32 +shenron.bm.openstreetmap:10.0.16.3 -3shenron.openstreetmap:200141c9000104000000000000000032:600 -3mail.openstreetmap:200141c9000104000000000000000032:600 -3lists.openstreetmap:200141c9000104000000000000000032:600 -3svn.openstreetmap:200141c9000104000000000000000032:600 -3git.openstreetmap:200141c9000104000000000000000032:600 -3trac.openstreetmap:200141c9000104000000000000000032:600 -3help.openstreetmap:200141c9000104000000000000000032:600 -3shop.openstreetmap:200141c9000104000000000000000032:600 -3dns.openstreetmap:200141c9000104000000000000000032:600 +3shenron.openstreetmap:200141c9000104000000000000000032 +3mail.openstreetmap:200141c9000104000000000000000032 +3lists.openstreetmap:200141c9000104000000000000000032 +3svn.openstreetmap:200141c9000104000000000000000032 +3git.openstreetmap:200141c9000104000000000000000032 +3trac.openstreetmap:200141c9000104000000000000000032 +3help.openstreetmap:200141c9000104000000000000000032 +3shop.openstreetmap:200141c9000104000000000000000032 +3dns.openstreetmap:200141c9000104000000000000000032 # 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 ++ouroboros.ic.openstreetmap:146.179.159.172:600 ++ouroboros.oob.openstreetmap:146.179.159.178:600 # GPS tile server @@ -318,10 +405,8 @@ Cparent.tile.openstreetmap:render.openstreetmap.org # 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 +3gorynych.openstreetmap:2a0206b8b0105065000000000000a001 +lurien.openstreetmap:193.55.222.229 +trogdor.openstreetmap:134.90.146.26 +trogdor.oob.openstreetmap:134.90.146.30 @@ -332,24 +417,39 @@ Cparent.tile.openstreetmap:render.openstreetmap.org +nepomuk.openstreetmap:77.95.70.166 3nepomuk.openstreetmap:2a0391800001002100000000000000a6 +simurgh.openstreetmap:94.20.20.55 -+tabaluga.openstreetmap:5.9.150.236 -3tabaluga.openstreetmap:2a0104f8019033eb0000000000000002 ++katie.openstreetmap:144.76.70.77 +3katie.openstreetmap:2a0104f80191834c0000000000000002 ++konqi.openstreetmap:81.7.11.83 +3konqi.openstreetmap:2a020180000100010000000005170b53 +nadder-01.openstreetmap:192.163.219.36 +nadder-02.openstreetmap:192.163.219.40 +longma.openstreetmap:140.110.240.7 3longma.openstreetmap:20010e10200002400000000000000007 +viserion.openstreetmap:193.198.233.211 3viserion.openstreetmap:20010b684cff00030000000000000003 ++drogon.openstreetmap:161.53.30.107 +3drogon.openstreetmap:20010b68c0ff000002215efffe40c7c4 ++saphira.openstreetmap:185.73.44.30 +3saphira.openstreetmap:20010ba800002c1e0000000000000000 ++sarkany.openstreetmap:37.17.173.8 +3sarkany.openstreetmap:20014c480002bf04025056fffe8f5c81 ++cmok.openstreetmap:31.130.201.40 +3cmok.openstreetmap:2001067c22681005021e8cfffe8c8d3b ++stormfly-02.openstreetmap:140.211.167.105 ++stormfly-02.oob.openstreetmap:10.0.0.108 ++odin.openstreetmap:130.225.254.123 +3odin.openstreetmap:20010878034600000000000000000123 # Blog aggregator (on Shaun McDonald's VM) -+blogs.openstreetmap:89.16.175.12 ++blogs.openstreetmap:213.138.110.209 +3blogs.openstreetmap:200141c8005105d1feff00fffe0032b8 # Continuous integration server (on Shaun McDonald's machine) +ci.openstreetmap:144.76.98.136 +cruise.openstreetmap:144.76.98.136 - + # Donation site +donate.openstreetmap:46.43.50.94:600 @@ -364,15 +464,3 @@ Cparent.tile.openstreetmap:render.openstreetmap.org +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: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