X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/225fd2d2671e41c8eaba3aef43ccaf3643a2d676..5f7d2726234b1104510ea3065eff75fd47478e51:/src/openstreetmap diff --git a/src/openstreetmap b/src/openstreetmap index dc779e2..8909e20 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -13,27 +13,25 @@ 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:600 @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 # Delegate geo.openstreetmap.org to PowerDNS # shenron.openstreetmap.org -&geo.openstreetmap:89.16.179.150:a.ns.openstreetmap +&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 -# bunyip.openstreetmap.org -&geo.openstreetmap:203.26.72.12:d.ns.openstreetmap # Main web servers and their aliases @@ -101,31 +99,36 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300 # Nominatim servers -+poldi.openstreetmap:128.40.168.106 -+nominatim.openstreetmap:128.40.168.106:3600 ++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 ++pummelzacken.openstreetmap:128.40.45.204 +#+nominatim.openstreetmap:128.40.45.204:600 ++nominatim.openstreetmap:188.40.32.215:600 +pummelzacken.ucl.openstreetmap:10.0.0.20 +pummelzacken.oob.openstreetmap:10.0.1.20 # 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 -+owl.openstreetmap:128.40.168.107 ++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 -+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 @@ -135,7 +138,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 ++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 @@ -165,86 +168,88 @@ Cparent.tile.openstreetmap:render.openstreetmap.org +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.ic.openstreetmap:146.179.159.173:600 +katla.oob.openstreetmap:146.179.159.174 ++ramoth.ic.openstreetmap:146.179.159.170 ++db-slave.ic.openstreetmap:146.179.159.170:600 ++ramoth.oob.openstreetmap:146.179.159.181 + # Development server with wildcard alias for user sites -+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 ++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 -+otrs.openstreetmap:128.40.168.102 -+thinkup.openstreetmap:128.40.168.102 -+blog.openstreetmap:128.40.168.102 -+foundation.openstreetmap:128.40.168.102 ++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 -+piwik.openstreetmap:128.40.168.101 ++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 -+agri.openstreetmap:128.40.168.108:3600 -+a.agri.openstreetmap:128.40.168.108:3600 -+b.agri.openstreetmap:128.40.168.108:3600 -+c.agri.openstreetmap:128.40.168.108:3600 -+os.openstreetmap:128.40.168.108:3600 -+a.os.openstreetmap:128.40.168.108:3600 -+b.os.openstreetmap:128.40.168.108:3600 -+c.os.openstreetmap:128.40.168.108:3600 ++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.168.95 ++draco.openstreetmap:128.40.45.195 +draco.ucl.openstreetmap:10.0.0.11 +draco.oob.openstreetmap:10.0.1.11 # Munin server -+urmel.openstreetmap:128.40.168.96 -+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 ++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 ++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.168.105 ++ascalon.openstreetmap:128.40.45.193 +ascalon.ucl.openstreetmap:10.0.0.18 +ascalon.oob.openstreetmap:10.0.1.18 -+roundup.openstreetmap:128.40.168.105:600 # Spare machines @@ -270,27 +275,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: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.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: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 # Wiki server @@ -302,14 +307,14 @@ Cparent.tile.openstreetmap:render.openstreetmap.org # 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.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 @@ -319,15 +324,13 @@ Cparent.tile.openstreetmap:render.openstreetmap.org 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 ++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 @@ -337,6 +340,10 @@ Cparent.tile.openstreetmap:render.openstreetmap.org +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 ++saphira.openstreetmap:185.73.44.30 +3saphira.openstreetmap:20010ba800002c1e0000000000000000 # Blog aggregator (on Shaun McDonald's VM) @@ -366,3 +373,10 @@ Cparent.tile.openstreetmap:render.openstreetmap.org #+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