X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/ffd3ddc2be2202f6e394c3f705c4f03fa17fb3d5..31dfa1870987a4648fe5892570b0f6c0fe08524d:/src/openstreetmap diff --git a/src/openstreetmap b/src/openstreetmap index 48342f8..86ae49e 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -13,25 +13,35 @@ 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:212.110.172.32:a:10 @noreply.openstreetmap::a.mx.openstreetmap:10 @otrs.openstreetmap::a.mx.openstreetmap:10 @messages.openstreetmap::a.mx.openstreetmap:10 -3a.mx.openstreetmap:200141c800100996021d7dfffec3df70 +3a.mx.openstreetmap:200141c9000104000000000000000032 # 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 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: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 +&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 @@ -83,6 +93,38 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300 +www.ic.openstreetmap:146.179.159.171:3600 +spike-03.oob.openstreetmap:146.179.159.187 ++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:3600 ++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:3600 ++spike-05.oob.openstreetmap:10.0.33.22 + # Rails application servers +thorn-01.ic.openstreetmap:146.179.159.165 @@ -97,34 +139,54 @@ 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 ++thorn-04.bm.openstreetmap:10.0.32.41 ++rails4.bm.openstreetmap:10.0.32.41 ++thorn-04.oob.openstreetmap:10.0.33.41 + ++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.168.106:600 -+nominatim.openstreetmap:128.40.168.106: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 ++poldi.oob.openstreetmap:146.179.159.186 -+pummelzacken.openstreetmap:128.40.168.105:600 ++pummelzacken.openstreetmap:128.40.45.204 +#+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 +#+dulcy.oob.openstreetmap: + # JXAPI server -+jxapi.openstreetmap:128.40.168.108:600 ++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 -+zark.openstreetmap:128.40.168.107:600 -+owl.openstreetmap:128.40.168.107:600 ++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 # Taginfo server -+grindtooth.openstreetmap:128.40.168.100:600 -+taginfo.openstreetmap:128.40.168.100:600 ++grindtooth.openstreetmap:128.40.45.199 +#+taginfo.openstreetmap:128.40.45.199:600 ++taginfo.openstreetmap:140.211.167.104:600 +grindtooth.ucl.openstreetmap:10.0.0.19 +grindtooth.oob.openstreetmap:10.0.1.19 @@ -134,7 +196,7 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300 3orm.openstreetmap:200106300012050002e081fffec52a8c #+orm.ic.openstreetmap:10.0.16.2 +orm.oob.openstreetmap:146.179.159.175 -+yevaud.openstreetmap:128.40.168.104:600 ++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 @@ -153,97 +215,111 @@ 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 ++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 +ironbelly.oob.openstreetmap:146.179.159.176 +backup.ic.openstreetmap:146.179.159.177 ++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 ++katla.bm.openstreetmap:10.0.32.40 ++db.bm.openstreetmap:10.0.32.40:600 ++katla.oob.openstreetmap:10.0.33.40 +ramoth.ic.openstreetmap:146.179.159.170 -+db.ic.openstreetmap:146.179.159.170:600 ++db-slave.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 ++fafnir.openstreetmap:52.50.86.69 # Development server with wildcard alias for user sites -+errol.openstreetmap:128.40.168.103:600 -+dev.openstreetmap:128.40.168.103:600 -+*.dev.openstreetmap:128.40.168.103:600 -+ooc.openstreetmap:128.40.168.103:600 -+a.ooc.openstreetmap:128.40.168.103:600 -+b.ooc.openstreetmap:128.40.168.103:600 -+c.ooc.openstreetmap:128.40.168.103:600 -+npe.openstreetmap:128.40.168.103:600 ++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 # Foundation server -+ridley.openstreetmap:128.40.168.102:600 -+otrs.openstreetmap:128.40.168.102:600 -+thinkup.openstreetmap:128.40.168.102:600 -+blog.openstreetmap:128.40.168.102:600 -+foundation.openstreetmap:128.40.168.102:600 ++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 # Piwik server -+eustace.openstreetmap:128.40.168.101:600 -+piwik.openstreetmap:128.40.168.101:600 ++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 # Imagery servers -+faffy.openstreetmap:128.40.168.108:600 -+agri.openstreetmap:128.40.168.108:600 -+a.agri.openstreetmap:128.40.168.108:600 -+b.agri.openstreetmap:128.40.168.108:600 -+c.agri.openstreetmap:128.40.168.108:600 -+os.openstreetmap:128.40.168.108:600 -+a.os.openstreetmap:128.40.168.108:600 -+b.os.openstreetmap:128.40.168.108:600 -+c.os.openstreetmap:128.40.168.108:600 -+faffy.ucl.openstreetmap:10.0.0.7 -+faffy.oob.openstreetmap:10.0.1.7 - -+draco.openstreetmap:128.40.168.95:600 ++draco.openstreetmap:128.40.45.195 ++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 +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 ++kessie.oob.openstreetmap:178.250.74.37 + # Munin server -+urmel.openstreetmap:128.40.168.96:600 -+munin.openstreetmap:128.40.168.96:600 ++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 # Gosmore routing server -+sarel.openstreetmap:128.40.168.97:600 ++sarel.openstreetmap:128.40.45.206 +sarel.ucl.openstreetmap:10.0.0.12 +sarel.oob.openstreetmap:10.0.1.12 # Forum server -+clifford.openstreetmap:128.40.168.98:600 ++clifford.openstreetmap:128.40.45.194 +clifford.ucl.openstreetmap:10.0.0.17 +clifford.oob.openstreetmap:10.0.1.17 # Loan machine for emacsen -+ascalon.openstreetmap:128.40.45.193:600 -#+ascalon.ucl.openstreetmap:10.0.0.18 -#+ascalon.oob.openstreetmap:10.0.1.18 ++ascalon.openstreetmap:128.40.45.193 ++ascalon.ucl.openstreetmap:10.0.0.18 ++ascalon.oob.openstreetmap:10.0.1.18 # Spare machines @@ -252,6 +328,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 @@ -269,27 +349,27 @@ Cparent.tile.openstreetmap:render.openstreetmap.org # Bytemark machine, and the services which operate from it -+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 -+dns.openstreetmap:89.16.179.150 ++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:200141c800100996021d7dfffec3df70 -3mail.openstreetmap:200141c800100996021d7dfffec3df70 -3lists.openstreetmap:200141c800100996021d7dfffec3df70 -3svn.openstreetmap:200141c800100996021d7dfffec3df70 -3git.openstreetmap:200141c800100996021d7dfffec3df70 -3trac.openstreetmap:200141c800100996021d7dfffec3df70 -3help.openstreetmap:200141c800100996021d7dfffec3df70 -3shop.openstreetmap:200141c800100996021d7dfffec3df70 -3dns.openstreetmap:200141c800100996021d7dfffec3df70 +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 @@ -301,49 +381,60 @@ Cparent.tile.openstreetmap:render.openstreetmap.org # GPS tile server -+noquiklos.openstreetmap:128.40.168.99:600 -+gps.tile.openstreetmap:128.40.168.99:600 -+gps-a.tile.openstreetmap:128.40.168.99:600 -+gps-b.tile.openstreetmap:128.40.168.99:600 -+gps-c.tile.openstreetmap:128.40.168.99:600 -+a.gps-tile.openstreetmap:128.40.168.99:600 -+b.gps-tile.openstreetmap:128.40.168.99:600 -+c.gps-tile.openstreetmap:128.40.168.99:600 ++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 +3gorynych.openstreetmap:2a0206b8b0105065000000000000a001 +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 ++jakelong.openstreetmap:64.62.205.202:600 +3jakelong.openstreetmap:2001047000010041a80000fffe3ecdca:600 +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 # 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 @@ -359,7 +450,9 @@ Cparent.tile.openstreetmap:render.openstreetmap.org +hot-staging.openstreetmap:144.76.31.210 +hot-dev.openstreetmap:144.76.31.210 -# Jochen Topf's taginfo service, running on openstreetmap.de hardware +# OSUOSL machines -#+taginfo.openstreetmap:85.214.112.59:600 -#3taginfo.openstreetmap:2a01023840000000002168799ac19e7e:600 ++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