X-Git-Url: https://git.openstreetmap.org./dns.git/blobdiff_plain/e64dace80c5124831d74bf5bc94427d7bac9c52a..5f7d2726234b1104510ea3065eff75fd47478e51:/src/openstreetmap diff --git a/src/openstreetmap b/src/openstreetmap index e8fbf70..8909e20 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -13,21 +13,21 @@ 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 @@ -100,11 +100,13 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300 # Nominatim servers +poldi.openstreetmap:128.40.45.203 -+nominatim.openstreetmap:128.40.45.203:3600 +#+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 @@ -125,7 +127,8 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300 # Taginfo server +grindtooth.openstreetmap:128.40.45.199 -+taginfo.openstreetmap:128.40.45.199:600 +#+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 @@ -165,14 +168,14 @@ 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-slave.ic.openstreetmap:146.179.159.173:600 ++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.45.196 @@ -210,10 +213,12 @@ Cparent.tile.openstreetmap:render.openstreetmap.org +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 -+a.os.openstreetmap:128.40.45.198:3600 -+b.os.openstreetmap:128.40.45.198:3600 -+c.os.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 @@ -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 @@ -324,8 +329,8 @@ Cparent.tile.openstreetmap:render.openstreetmap.org +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 @@ -335,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) @@ -364,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