X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/8992f4b0fcf0b7087aedef5386fc076a63a536ba..4a17cdbccce54835f93a04a3ece00e89e32a552f:/src/openstreetmap diff --git a/src/openstreetmap b/src/openstreetmap index f99f292..9c65563 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 +&geo.openstreetmap:212.110.172.32:a.ns.openstreetmap +# saphira.openstreetmap.org +&geo.openstreetmap:185.73.44.30:b.ns.openstreetmap # fume.openstreetmap.org &geo.openstreetmap:85.30.190.241: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 @@ -99,16 +109,23 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300 # 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 ++poldi.oob.openstreetmap:146.179.159.186 +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 ++dulcy.ic.openstreetmap:146.179.159.179 +#+dulcy.oob.openstreetmap: + # JXAPI server +norbert.openstreetmap:128.40.45.202 @@ -158,15 +175,16 @@ Cparent.tile.openstreetmap:render.openstreetmap.org 3stats.openstreetmap:2001063000120500022590fffec4f6ef +planet.openstreetmap:193.63.75.107 3planet.openstreetmap:2001063000120500022590fffec4f6ef ++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 # Database servers -+smaug.ic.openstreetmap:146.179.159.168 -+smaug.oob.openstreetmap:146.179.159.182 - +katla.ic.openstreetmap:146.179.159.173 +db.ic.openstreetmap:146.179.159.173:600 +katla.oob.openstreetmap:146.179.159.174 @@ -207,24 +225,22 @@ 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 ++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 -+faffy.ucl.openstreetmap:10.0.0.7 -+faffy.oob.openstreetmap:10.0.1.7 - -+draco.openstreetmap:128.40.45.195 +draco.ucl.openstreetmap:10.0.0.11 +draco.oob.openstreetmap:10.0.1.11 ++grisu.openstreetmap:193.63.75.108 +3grisu.openstreetmap:2001063000120500dad385fffe5d87a0 ++grisu.ic.openstreetmap:146.179.159.168 ++grisu.oob.openstreetmap:146.179.159.182 + ++kessie.openstreetmap:178.250.74.36 ++kessie.oob.openstreetmap:178.250.74.37 + # Munin server +urmel.openstreetmap:128.40.45.207 @@ -257,6 +273,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 @@ -274,27 +294,27 @@ 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 @@ -323,6 +343,7 @@ Cparent.tile.openstreetmap:render.openstreetmap.org 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 @@ -333,20 +354,29 @@ 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 # 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) @@ -368,11 +398,6 @@ 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 - -#+taginfo.openstreetmap:85.214.112.59:600 -#3taginfo.openstreetmap:2a01023840000000002168799ac19e7e:600 - # OSUOSL machines +stormfly-01.openstreetmap:140.211.167.104