X-Git-Url: https://git.openstreetmap.org/dns.git/blobdiff_plain/f2ae3b5a8119bb01ea69d245c36f1ae62ac3eb94..180ee03da82d1cc51a64a2f4ab02bff3dd6cb9bb:/src/openstreetmap diff --git a/src/openstreetmap b/src/openstreetmap index 3317b83..ec632bf 100644 --- a/src/openstreetmap +++ b/src/openstreetmap @@ -11,6 +11,10 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300 .openstreetmap::b.ns.bytemark.co.uk .openstreetmap::c.ns.bytemark.co.uk +# Publish a CAA record indicating that only letsencrypt should issue certificates + +:openstreetmap:257:\000\005\151\163\163\165\145\154\145\164\163\145\156\143\162\171\160\164\056\157\162\147 + # Make the virtual machine the primary MX with Bytemark as backup @openstreetmap:212.110.172.32:a:10 @@ -22,122 +26,166 @@ Zopenstreetmap:a.ns.bytemark.co.uk:hostmaster.openstreetmap.org:::::300 # Publish an SPF record indicating that only shenron sends mail -'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 +# https://anders.com/projects/sysadmin/djbdnsRecordBuilder/ +# v=spf1 ip4:212.110.172.32 ip6:2001:41c9:1:400::32 mx -all +'openstreetmap:v=spf1\040ip4\072212.110.172.32\040ip6\0722001\07241c9\0721\072400\072\07232\040mx\040-all:86400 +'otrs.openstreetmap:v=spf1\040ip4\072212.110.172.32\040ip6\0722001\07241c9\0721\072400\072\07232\040mx\040-all:86400 + +# Google postmaster tools verification -# Add Google Postmaster Tools Verification -# Grant Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com +'openstreetmap:google-site-verification=oMMclkNxMVPPk0lhThg5S7cuzUZmtL_OZWTCrAwNcqQ # Delegate geo.openstreetmap.org to PowerDNS -# shenron.openstreetmap.org -&geo.openstreetmap:212.110.172.32:a.ns.openstreetmap # saphira.openstreetmap.org -&geo.openstreetmap:185.73.44.30:b.ns.openstreetmap +&geo.openstreetmap:185.73.44.30:a.ns.openstreetmap # ridgeback.openstreetmap.org -&geo.openstreetmap:31.169.50.10:c.ns.openstreetmap +&geo.openstreetmap:31.169.50.10:b.ns.openstreetmap # jakelong.openstreetmap.org -&geo.openstreetmap:64.62.205.202:d.ns.openstreetmap +&geo.openstreetmap:71.19.155.177:c.ns.openstreetmap # katie.openstreetmap.org -&geo.openstreetmap:144.76.70.77:e.ns.openstreetmap +&geo.openstreetmap:144.76.70.77:d.ns.openstreetmap # stormfly-02.openstreetmap.org -&geo.openstreetmap:140.211.167.105:f.ns.openstreetmap +&geo.openstreetmap:140.211.167.105:e.ns.openstreetmap +# chrysophylax.openstreetmap.org +&geo.openstreetmap:217.71.244.22:f.ns.openstreetmap # Main web servers and their aliases -+spike-01.openstreetmap:193.63.75.99 -3spike-01.openstreetmap:2001063000120500021a4bfffea5fd2a -#+openstreetmap:193.63.75.99:600 -#3openstreetmap:2001063000120500021a4bfffea5fd2a:600 -#+www.openstreetmap:193.63.75.99:600 -#3www.openstreetmap:2001063000120500021a4bfffea5fd2a:600 -#+api.openstreetmap:193.63.75.99:600 -#3api.openstreetmap:2001063000120500021a4bfffea5fd2a:600 -#+maps.openstreetmap:193.63.75.99:600 -#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-02.openstreetmap:193.63.75.100 -3spike-02.openstreetmap:20010630001205000219bbfffe393d9e -#+openstreetmap:193.63.75.100:600 -#3openstreetmap:20010630001205000219bbfffe393d9e:600 -#+www.openstreetmap:193.63.75.100:600 -#3www.openstreetmap:20010630001205000219bbfffe393d9e:600 -#+api.openstreetmap:193.63.75.100:600 -#3api.openstreetmap:20010630001205000219bbfffe393d9e:600 -#+maps.openstreetmap:193.63.75.100:600 -#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-03.openstreetmap:193.63.75.103 -3spike-03.openstreetmap:20010630001205000219bbfffe398aba -#+openstreetmap:193.63.75.103:600 -#3openstreetmap:20010630001205000219bbfffe398aba:600 -#+www.openstreetmap:193.63.75.103:600 -#3www.openstreetmap:20010630001205000219bbfffe398aba:600 -#+api.openstreetmap:193.63.75.103:600 -#3api.openstreetmap:20010630001205000219bbfffe398aba:600 -#+maps.openstreetmap:193.63.75.103:600 -#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-01.openstreetmap:130.117.76.6 +3spike-01.openstreetmap:200109780002002c0000000001720006 +#+openstreetmap:130.117.76.6:600 +#3openstreetmap:200109780002002c0000000001720006:600 +#+www.openstreetmap:130.117.76.6:600 +#3www.openstreetmap:200109780002002c0000000001720006:600 +#+api.openstreetmap:130.117.76.6:600 +#3api.openstreetmap:200109780002002c0000000001720006:600 +#+maps.openstreetmap:130.117.76.6:600 +#3maps.openstreetmap:200109780002002c0000000001720006:600 +#+mapz.openstreetmap:130.117.76.6:600 +#3mapz.openstreetmap:200109780002002c0000000001720006:600 ++spike-01.ams.openstreetmap:10.0.48.6 ++spike-01.oob.openstreetmap:10.0.49.6 + ++spike-02.openstreetmap:130.117.76.7 +3spike-02.openstreetmap:200109780002002c0000000001720007 +#+openstreetmap:130.117.76.7:600 +#3openstreetmap:200109780002002c0000000001720007:600 +#+www.openstreetmap:130.117.76.7:600 +#3www.openstreetmap:200109780002002c0000000001720007:600 +#+api.openstreetmap:130.117.76.7:600 +#3api.openstreetmap:200109780002002c0000000001720007:600 +#+maps.openstreetmap:130.117.76.7:600 +#3maps.openstreetmap:200109780002002c0000000001720007:600 +#+mapz.openstreetmap:130.117.76.7:600 +#3mapz.openstreetmap:200109780002002c0000000001720007:600 ++spike-02.ams.openstreetmap:10.0.48.7 ++spike-02.oob.openstreetmap:10.0.49.7 + ++spike-03.openstreetmap:130.117.76.8 +3spike-03.openstreetmap:200109780002002c0000000001720008 +#+openstreetmap:130.117.76.8:600 +#3openstreetmap:200109780002002c0000000001720008:600 +#+www.openstreetmap:130.117.76.8:600 +#3www.openstreetmap:200109780002002c0000000001720008:600 +#+api.openstreetmap:130.117.76.8:600 +#3api.openstreetmap:200109780002002c0000000001720008:600 +#+maps.openstreetmap:130.117.76.8:600 +#3maps.openstreetmap:200109780002002c0000000001720008:600 +#+mapz.openstreetmap:130.117.76.8:600 +#3mapz.openstreetmap:200109780002002c0000000001720008:600 ++spike-03.ams.openstreetmap:10.0.48.8 ++spike-03.oob.openstreetmap:10.0.49.8 +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 +#+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 +#+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 ++spike-06.openstreetmap:130.117.76.11 +3spike-06.openstreetmap:200109780002002c000000000172000B ++openstreetmap:130.117.76.11:600 +3openstreetmap:200109780002002c000000000172000B:600 ++www.openstreetmap:130.117.76.11:600 +3www.openstreetmap:200109780002002c000000000172000B:600 ++api.openstreetmap:130.117.76.11:600 +3api.openstreetmap:200109780002002c000000000172000B:600 ++maps.openstreetmap:130.117.76.11:600 +3maps.openstreetmap:200109780002002c000000000172000B:600 ++mapz.openstreetmap:130.117.76.11:600 +3mapz.openstreetmap:200109780002002c000000000172000B:600 ++spike-06.ams.openstreetmap:10.0.48.11 ++spike-06.oob.openstreetmap:10.0.49.11 + ++spike-07.openstreetmap:130.117.76.12 +3spike-07.openstreetmap:200109780002002c000000000172000C ++openstreetmap:130.117.76.12:600 +3openstreetmap:200109780002002c000000000172000C:600 ++www.openstreetmap:130.117.76.12:600 +3www.openstreetmap:200109780002002c000000000172000C:600 ++api.openstreetmap:130.117.76.12:600 +3api.openstreetmap:200109780002002c000000000172000C:600 ++maps.openstreetmap:130.117.76.12:600 +3maps.openstreetmap:200109780002002c000000000172000C:600 ++mapz.openstreetmap:130.117.76.12:600 +3mapz.openstreetmap:200109780002002c000000000172000C:600 ++spike-07.ams.openstreetmap:10.0.48.12 ++spike-07.oob.openstreetmap:10.0.49.12 + ++spike-08.openstreetmap:130.117.76.13 +3spike-08.openstreetmap:200109780002002c000000000172000D ++openstreetmap:130.117.76.13:600 +3openstreetmap:200109780002002c000000000172000D:600 ++www.openstreetmap:130.117.76.13:600 +3www.openstreetmap:200109780002002c000000000172000D:600 ++api.openstreetmap:130.117.76.13:600 +3api.openstreetmap:200109780002002c000000000172000D:600 ++maps.openstreetmap:130.117.76.13:600 +3maps.openstreetmap:200109780002002c000000000172000D:600 ++mapz.openstreetmap:130.117.76.13:600 +3mapz.openstreetmap:200109780002002c000000000172000D:600 ++spike-08.ams.openstreetmap:10.0.48.13 ++spike-08.oob.openstreetmap:10.0.49.13 + # 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.ams.openstreetmap:10.0.48.51 ++rails1.ams.openstreetmap:10.0.48.51 ++thorn-01.oob.openstreetmap:10.0.49.51 -+thorn-02.ic.openstreetmap:146.179.159.166 -+rails2.ic.openstreetmap:146.179.159.166 -+thorn-02.oob.openstreetmap:146.179.159.184 ++thorn-02.ams.openstreetmap:10.0.48.52 ++rails2.ams.openstreetmap:10.0.48.52 ++thorn-02.oob.openstreetmap:10.0.49.52 -+thorn-03.ic.openstreetmap:146.179.159.167 -+rails3.ic.openstreetmap:146.179.159.167 -+thorn-03.oob.openstreetmap:146.179.159.183 ++thorn-03.ams.openstreetmap:10.0.48.53 ++rails3.ams.openstreetmap:10.0.48.53 ++thorn-03.oob.openstreetmap:10.0.49.53 +thorn-04.bm.openstreetmap:10.0.32.41 +rails4.bm.openstreetmap:10.0.32.41 @@ -149,84 +197,80 @@ Caf323lytato5.openstreetmap:gv-o4v3qh5pfayqex.dv.googlehosted.com # Nominatim servers -+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.openstreetmap:193.60.236.18 +#+nominatim.openstreetmap:193.60.236.18: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 - -+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.45.209 -+owl.openstreetmap:128.40.45.209 -+zark.ucl.openstreetmap:10.0.0.8 -+zark.oob.openstreetmap:10.0.1.8 ++dulcy.openstreetmap:130.117.76.9 +3dulcy.openstreetmap:200109780002002c0000000001720009 ++nominatim.openstreetmap:130.117.76.9:600 +3nominatim.openstreetmap:200109780002002c0000000001720009:600 ++dulcy.ams.openstreetmap:10.0.48.9 ++dulcy.oob.openstreetmap:10.0.49.9 # Taginfo server -+grindtooth.openstreetmap:128.40.45.199 -#+taginfo.openstreetmap:128.40.45.199:600 -+taginfo.openstreetmap:140.211.167.104:600 ++grindtooth.openstreetmap:193.60.236.15 ++taginfo.openstreetmap:193.60.236.15:600 +grindtooth.ucl.openstreetmap:10.0.0.19 +grindtooth.oob.openstreetmap:10.0.1.19 ++stormfly-01.openstreetmap:140.211.167.104 +6stormfly-01.openstreetmap:2605bc8030100700000000008cdea768 +#+taginfo.openstreetmap:140.211.167.104:600 +#3taginfo.openstreetmap:2605bc8030100700000000008cdea768: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 -+yevaud.openstreetmap:128.40.45.208 -+yevaud.ucl.openstreetmap:10.0.0.15 -+yevaud.oob.openstreetmap:10.0.1.15 ++orm.openstreetmap:130.117.76.3 +3orm.openstreetmap:200109780002002c0000000001720003 ++orm.ams.openstreetmap:10.0.48.3 ++orm.oob.openstreetmap:10.0.49.3 + ++odin.openstreetmap:130.117.76.15 +3odin.openstreetmap:200109780002002c000000000172000F ++odin.ams.openstreetmap:10.0.48.15 ++odin.oob.openstreetmap:10.0.49.15 + ++ysera.openstreetmap:193.60.236.22 ++ysera.ucl.openstreetmap:10.0.0.15 ++ysera.oob.openstreetmap:10.0.1.15 + ++scorch.openstreetmap:176.31.235.79 +3scorch.openstreetmap:200141d00002fc4f0000000000000001 + ++rhaegal.openstreetmap:161.53.248.77:600 + ++pyrene.openstreetmap:140.211.167.98 +3pyrene.openstreetmap:2605bc8030100700000000008cd3a762 ++pyrene.oob.openstreetmap:10.0.0.40 + ++bowser.openstreetmap:138.44.68.106 + Ctile.openstreetmap:tile.geo.openstreetmap.org Ca.tile.openstreetmap:tile.geo.openstreetmap.org Cb.tile.openstreetmap:tile.geo.openstreetmap.org Cc.tile.openstreetmap:tile.geo.openstreetmap.org -Cparent.tile.openstreetmap:render.openstreetmap.org # Services machine -+ironbelly.openstreetmap:193.63.75.107 -3ironbelly.openstreetmap:2001063000120500022590fffec4f6ef -+chef.openstreetmap:193.63.75.107 -3chef.openstreetmap:2001063000120500022590fffec4f6ef -+backup.openstreetmap:193.63.75.107 -3backup.openstreetmap:2001063000120500022590fffec4f6ef -+stats.openstreetmap:193.63.75.107 -3stats.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 ++ironbelly.openstreetmap:130.117.76.10 +3ironbelly.openstreetmap:200109780002002c000000000172000a ++backup.openstreetmap:130.117.76.10:600 +3backup.openstreetmap:200109780002002c000000000172000a:600 ++planet.openstreetmap:130.117.76.10:600 +3planet.openstreetmap:200109780002002c000000000172000a:600 ++logstash.openstreetmap:130.117.76.10 +3logstash.openstreetmap:200109780002002c000000000172000a ++ironbelly.ams.openstreetmap:10.0.48.10 ++ironbelly.oob.openstreetmap:10.0.49.10 +grisu.openstreetmap:89.16.162.20 3grisu.openstreetmap:200141c9000200d60000000000000020 +#+backup.openstreetmap:89.16.162.20:600 +#3backup.openstreetmap:200141c9000200d60000000000000020:600 #+planet.openstreetmap:89.16.162.20:600 #3planet.openstreetmap:200141c9000200d60000000000000020:600 +grisu.bm.openstreetmap:10.0.32.20 @@ -234,184 +278,182 @@ Cparent.tile.openstreetmap:render.openstreetmap.org # Database servers ++karm.ams.openstreetmap:10.0.48.50 ++karm.oob.openstreetmap:10.0.49.50 + ++eddie.ucl.openstreetmap:10.0.0.10 ++eddie.oob.openstreetmap:10.0.1.10 + +katla.bm.openstreetmap:10.0.32.40 -+db.openstreetmap:10.0.32.40:600 +katla.oob.openstreetmap:10.0.33.40 -+ramoth.ic.openstreetmap:146.179.159.170 -+db-slave.openstreetmap:146.179.159.170:600 -+ramoth.oob.openstreetmap:146.179.159.181 - -+fafnir.openstreetmap:52.50.86.69 ++ramoth.ams.openstreetmap:10.0.48.5 ++ramoth.oob.openstreetmap:10.0.49.5 # Development server with wildcard alias for user sites -+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.openstreetmap:193.60.236.13 ++dev.openstreetmap:193.60.236.13 ++*.dev.openstreetmap:193.60.236.13 ++ooc.openstreetmap:193.60.236.13 ++a.ooc.openstreetmap:193.60.236.13 ++b.ooc.openstreetmap:193.60.236.13 ++c.ooc.openstreetmap:193.60.236.13 ++npe.openstreetmap:193.60.236.13 +errol.ucl.openstreetmap:10.0.0.14 +errol.oob.openstreetmap:10.0.1.14 # Foundation server -+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.openstreetmap:193.60.236.19 ++otrs.openstreetmap:193.60.236.19 ++blog.openstreetmap:193.60.236.19 ++foundation.openstreetmap:193.60.236.19 ++hot.openstreetmap:193.60.236.19 ++dmca.openstreetmap:193.60.236.19 +ridley.ucl.openstreetmap:10.0.0.3 +ridley.oob.openstreetmap:10.0.1.3 # Piwik server -+eustace.openstreetmap:128.40.45.197 -+piwik.openstreetmap:128.40.45.197 ++eustace.openstreetmap:193.60.236.14 ++piwik.openstreetmap:193.60.236.14 +eustace.ucl.openstreetmap:10.0.0.9 +eustace.oob.openstreetmap:10.0.1.9 # Imagery servers -+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.openstreetmap:193.60.236.12 +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 ++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 -+munin.openstreetmap:128.40.45.207:600 ++urmel.openstreetmap:193.60.236.21 ++munin.openstreetmap:193.60.236.21 +urmel.ucl.openstreetmap:10.0.0.6 +urmel.oob.openstreetmap:10.0.1.6 -# Gosmore routing server +# Chef server -+sarel.openstreetmap:128.40.45.206 ++sarel.openstreetmap:193.60.236.20 ++chef.openstreetmap:193.60.236.20 ++hardware.openstreetmap:193.60.236.20 ++acme.openstreetmap:193.60.236.20 ++git.openstreetmap:193.60.236.20:600 ++dns.openstreetmap:193.60.236.20:600 +sarel.ucl.openstreetmap:10.0.0.12 +sarel.oob.openstreetmap:10.0.1.12 # Forum server -+clifford.openstreetmap:128.40.45.194 ++clifford.openstreetmap:193.60.236.11 ++forum.openstreetmap:193.60.236.11:600 +clifford.ucl.openstreetmap:10.0.0.17 +clifford.oob.openstreetmap:10.0.1.17 -# Loan machine for emacsen - -+ascalon.openstreetmap:128.40.45.193 -+ascalon.ucl.openstreetmap:10.0.0.18 -+ascalon.oob.openstreetmap:10.0.1.18 - -# Spare machines - -+puff.ucl.openstreetmap:10.0.0.10 -+puff.oob.openstreetmap:10.0.1.10 -+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 -+apc2.ucl.openstreetmap:10.0.0.50 -+apc3.ucl.openstreetmap:10.0.0.51 - # Managed network switches -+switch1.openstreetmap:193.63.75.102 -+switch2.ic.openstreetmap:146.179.159.169 ++switch1.openstreetmap:130.117.76.2 +3switch1.openstreetmap:200109780002002c0000000001720002 -# Forum server +# Managed power strips -+forum.openstreetmap:46.19.218.68:600 ++pdu1.ams.openstreetmap:10.0.48.100 ++pdu2.ams.openstreetmap:10.0.48.101 # Bytemark machine, and the services which operate from it +shenron.openstreetmap:212.110.172.32 +mail.openstreetmap:212.110.172.32 ++mta-sts.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 ++blogs.openstreetmap:212.110.172.32:600 +shenron.bm.openstreetmap:10.0.16.3 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 +3blogs.openstreetmap:200141c9000104000000000000000032:600 + +# Wiki servers -# Wiki server ++ouroboros.openstreetmap:130.117.76.4 +3ouroboros.openstreetmap:200109780002002c0000000001720004 +#+wiki.openstreetmap:130.117.76.4:600 +#3wiki.openstreetmap:200109780002002c0000000001720004:600 ++ouroboros.ams.openstreetmap:10.0.48.4 ++ouroboros.oob.openstreetmap:10.0.49.4 -+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 ++tabaluga.openstreetmap:130.117.76.14 +3tabaluga.openstreetmap:200109780002002c000000000172000E ++wiki.openstreetmap:130.117.76.14:600 +3wiki.openstreetmap:200109780002002c000000000172000E:600 ++tabaluga.ams.openstreetmap:10.0.48.14 ++tabaluga.oob.openstreetmap:10.0.49.14 # GPS tile server -+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.openstreetmap:193.60.236.16 ++gps-tile.openstreetmap:193.60.236.16 ++a.gps-tile.openstreetmap:193.60.236.16 ++b.gps-tile.openstreetmap:193.60.236.16 ++c.gps-tile.openstreetmap:193.60.236.16 ++gps.tile.openstreetmap:193.60.236.16 ++gps-a.tile.openstreetmap:193.60.236.16 ++gps-b.tile.openstreetmap:193.60.236.16 ++gps-c.tile.openstreetmap:193.60.236.16 +noquiklos.ucl.openstreetmap:10.0.0.13 +noquiklos.oob.openstreetmap:10.0.1.13 # Tile cache servers -+gorynych.openstreetmap:130.193.62.73 ++gorynych.openstreetmap:5.45.248.21 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:600 -3jakelong.openstreetmap:2001047000010041a80000fffe3ecdca:600 -+nepomuk.openstreetmap:77.95.70.166 -3nepomuk.openstreetmap:2a0391800001002100000000000000a6 ++jakelong.openstreetmap:71.19.155.177:600 +3jakelong.openstreetmap:2605270000000017a80000fffe3ecdca:600 ++nepomuk.openstreetmap:77.95.65.39 +3nepomuk.openstreetmap:2a039180000001000000000000000007 +simurgh.openstreetmap:94.20.20.55 +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 @@ -420,39 +462,97 @@ Cparent.tile.openstreetmap:render.openstreetmap.org 3drogon.openstreetmap:20010b68c0ff000002215efffe40c7c4 +saphira.openstreetmap:185.73.44.30 3saphira.openstreetmap:20010ba800002c1e0000000000000000 ++toothless.openstreetmap:185.73.44.167 +3toothless.openstreetmap:20010ba800002ca70000000000000000 +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: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 ++stormfly-02.openstreetmap:140.211.167.105 +6stormfly-02.openstreetmap:2605bc8030100700000000008cdea769 ++stormfly-02.oob.openstreetmap:10.0.0.108 ++rimfaxe.openstreetmap:130.225.254.109 +3rimfaxe.openstreetmap:20010878034600000000000000000109 ++culebre.openstreetmap:155.210.4.103 ++kalessin.openstreetmap:185.66.195.245 +3kalessin.openstreetmap:2a032260200000010000000000000005 ++angor.openstreetmap:196.10.54.165 +#3angor.openstreetmap:200143f801f40b00b283fefffed8dd45 ++ladon.openstreetmap:83.212.2.116 +3ladon.openstreetmap:200106482ffe00040000000000000116 ++ascalon.openstreetmap:184.107.48.228 ++noomoahk.openstreetmap:91.224.148.166 +3noomoahk.openstreetmap:2a0372208080a6000000000000000001 ++cherufe.openstreetmap:200.91.44.37 ++norbert.openstreetmap:89.234.186.100 +3norbert.openstreetmap:2a005884821c00000000000000000001 ++chrysophylax.openstreetmap:217.71.244.22 +3chrysophylax.openstreetmap:200108e0004020390000000000000010 ++necrosan.openstreetmap:80.67.167.77 +3necrosan.openstreetmap:2a0bcbc0110d0001000000000000001c ++keizer.openstreetmap:195.201.226.63 +3keizer.openstreetmap:2a0104f81c1cbc540000000000000001 ++vipertooth.openstreetmap:176.122.99.101 +3vipertooth.openstreetmap:2001067c2d4000000000000000000065 ++tuatara.openstreetmap:114.23.141.203 +3tuatara.openstreetmap:24061e00b4100c24529a4cfffe79bc3b ++waima.openstreetmap:103.197.61.160 ++nidhogg.openstreetmap:130.236.254.221 +3nidhogg.openstreetmap:200106b00017f0a000000000000000dd ++boitata.openstreetmap:200.236.31.207 +3boitata.openstreetmap:2801008280ff80020216ccfffeaa0021 ++fafnir.openstreetmap:130.239.18.114 +3fafnir.openstreetmap:200106b0000e2a180000000000000114 ++fume.openstreetmap:147.228.60.16 ++balerion.openstreetmap:138.44.68.134 ++naga.openstreetmap:185.116.130.151 + +# Blades + ++tiamat-00.openstreetmap:193.60.236.40 ++tiamat-00.ucl.openstreetmap:10.0.0.40 ++tiamat-00.oob.openstreetmap:10.0.1.40 ++tiamat-01.openstreetmap:193.60.236.41 ++tiamat-01.ucl.openstreetmap:10.0.0.41 ++tiamat-01.oob.openstreetmap:10.0.1.41 ++tiamat-02.openstreetmap:193.60.236.42 ++tiamat-02.ucl.openstreetmap:10.0.0.42 ++tiamat-02.oob.openstreetmap:10.0.1.42 ++tiamat-03.openstreetmap:193.60.236.43 ++tiamat-03.ucl.openstreetmap:10.0.0.43 ++tiamat-03.oob.openstreetmap:10.0.1.43 ++tiamat-10.openstreetmap:193.60.236.44 ++tiamat-10.ucl.openstreetmap:10.0.0.44 ++tiamat-10.oob.openstreetmap:10.0.1.44 ++tiamat-11.openstreetmap:193.60.236.45 ++tiamat-11.ucl.openstreetmap:10.0.0.45 ++tiamat-11.oob.openstreetmap:10.0.1.45 ++tiamat-12.openstreetmap:193.60.236.46 ++tiamat-12.ucl.openstreetmap:10.0.0.46 ++tiamat-12.oob.openstreetmap:10.0.1.46 ++tiamat-13.openstreetmap:193.60.236.47 ++tiamat-13.ucl.openstreetmap:10.0.0.47 ++tiamat-13.oob.openstreetmap:10.0.1.47 ++tiamat-20.openstreetmap:193.60.236.48 ++tiamat-20.ucl.openstreetmap:10.0.0.48 ++tiamat-20.oob.openstreetmap:10.0.1.48 ++tiamat-21.openstreetmap:193.60.236.49 ++tiamat-21.ucl.openstreetmap:10.0.0.49 ++tiamat-21.oob.openstreetmap:10.0.1.49 ++tiamat-22.openstreetmap:193.60.236.50 ++tiamat-22.ucl.openstreetmap:10.0.0.50 ++tiamat-22.oob.openstreetmap:10.0.1.50 ++tiamat-23.openstreetmap:193.60.236.51 ++tiamat-23.ucl.openstreetmap:10.0.0.51 ++tiamat-23.oob.openstreetmap:10.0.1.51 # Donation site -+donate.openstreetmap:46.43.50.94:600 - -# DMCA Notice site - -+dmca.openstreetmap:46.43.50.94:600 ++donate.openstreetmap:193.60.236.19:300 -# HOT site +# Uptime site at StatusCake -+hot.openstreetmap:144.76.31.210 -+humanitarian.openstreetmap:144.76.31.210 -+hot-staging.openstreetmap:144.76.31.210 -+hot-dev.openstreetmap:144.76.31.210 +Cuptime.openstreetmap:uptimessl.statuscake.com -# 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 +# Custom Domain for https://github.com/osmfoundation/welcome-mat/ +Cwelcome.openstreetmap:osmfoundation.github.io