From 22b6dfd4a49224805ef6515c64f74c98bbfe53f6 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 25 Oct 2021 12:37:47 +0100 Subject: [PATCH 1/1] Stop building gdns maps for the old tile CDN --- Makefile | 13 +- bandwidth/tile.openstreetmap.yml | 243 -------------------------- src/render.openstreetmap.yml | 113 ------------ src/tile.openstreetmap.yml | 287 ------------------------------- 4 files changed, 1 insertion(+), 655 deletions(-) delete mode 100644 bandwidth/tile.openstreetmap.yml delete mode 100644 src/render.openstreetmap.yml delete mode 100644 src/tile.openstreetmap.yml diff --git a/Makefile b/Makefile index 063dfb8..0328866 100644 --- a/Makefile +++ b/Makefile @@ -19,13 +19,7 @@ update_geodns: gdns sshfp: bin/mksshfp -gdns: gdns_tile gdns_render gdns_nominatim - -gdns_tile: lib/countries.xml origins/tile.openstreetmap.yml - bin/mkgeo origins/tile.openstreetmap.yml src/tile.openstreetmap.yml tile origins/render.openstreetmap.yml tile - -gdns_render: lib/countries.xml origins/render.openstreetmap.yml - bin/mkgeo origins/render.openstreetmap.yml src/render.openstreetmap.yml render origins/tile-total.openstreetmap.yml +gdns: gdns_nominatim gdns_nominatim: lib/countries.xml origins/nominatim.openstreetmap.yml bin/mkgeo origins/nominatim.openstreetmap.yml src/nominatim.openstreetmap.yml nominatim origins/nominatim-total.openstreetmap.yml nominatim @@ -36,10 +30,5 @@ clean: lib/countries.xml: curl -s -o $@ http://api.geonames.org/countryInfo?username=demo -origins/tile.openstreetmap.yml: bin/mkcountries lib/countries.xml bandwidth/tile.openstreetmap.yml - bin/mkcountries bandwidth/tile.openstreetmap.yml origins/tile.openstreetmap.yml - -origins/render.openstreetmap.yml: gdns_tile - origins/nominatim.openstreetmap.yml: bin/mkcountries lib/countries.xml bandwidth/nominatim.openstreetmap.yml bin/mkcountries bandwidth/nominatim.openstreetmap.yml origins/nominatim.openstreetmap.yml diff --git a/bandwidth/tile.openstreetmap.yml b/bandwidth/tile.openstreetmap.yml deleted file mode 100644 index cb3dba2..0000000 --- a/bandwidth/tile.openstreetmap.yml +++ /dev/null @@ -1,243 +0,0 @@ ---- -AD: 147607.008889 -AE: 1980282.98889 -AF: 202257.473333 -AG: 30940.2377778 -AI: 3555.73333333 -AL: 1456264.04667 -AM: 1720294.78889 -AO: 245780.142222 -AQ: 1237.71111111 -AR: 24028705.0622 -AS: 26602.3066667 -AT: 27525216.7444 -AU: 17740199.6244 -AW: 181238.857778 -AX: 81417.5666667 -AZ: 1644721.66667 -BA: 5360357.34222 -BB: 113795.402222 -BD: 2637835.48667 -BE: 31379699.3333 -BF: 171339.873333 -BG: 16462872.4089 -BH: 178017.288889 -BI: 39235.9111111 -BJ: 144971.944444 -BL: 26516.7333333 -BM: 68879.2688889 -BN: 101534.3 -BO: 6598657.62444 -BQ: 33092.2377778 -BR: 67895824.1933 -BS: 80005.3155556 -BT: 73882.6844444 -BW: 177755.48 -BY: 28140174.3933 -BZ: 244055.38 -CA: 39801926.6378 -CC: 239.693333333 -CD: 210700.564444 -CF: 1863.07111111 -CG: 70769.4266667 -CH: 25966555.3289 -CI: 991001.822222 -CK: 10671.6288889 -CL: 16922485.0578 -CM: 461239.615556 -CN: 3798976.38889 -CO: 17048273.6867 -CR: 2311707.40667 -CU: 261635.568889 -CV: 88190.0733333 -CW: 255916.342222 -CX: 93.2311111111 -CY: 1502580.43111 -CZ: 22924934.3844 -DE: 279437893.16 -DJ: 33447.0022222 -DK: 42115588.14 -DM: 62577.2711111 -DO: 1529532.88667 -DZ: 1634276.29556 -EC: 12126472.5289 -EE: 3663255.88667 -EG: 1931109.31333 -ER: 2352.07777778 -ES: 55510741.8511 -ET: 298329.402222 -FI: 11534177.54 -FJ: 52474.5955556 -FK: 10019.4333333 -FM: 9121.48888889 -FO: 161446.755556 -FR: 221971649.922 -GA: 56198.3333333 -GB: 123336985.522 -GD: 11526.4644444 -GE: 3335886.76222 -GF: 127130.957778 -GG: 169221.824444 -GH: 655150.575556 -GI: 89231.48 -GL: 100099.573333 -GM: 51320.2911111 -GN: 94694.3466667 -GP: 459603.5 -GQ: 12567.7688889 -GR: 19410573.1422 -GT: 3371719.58444 -GU: 65648.3622222 -GW: 9547.81777778 -GY: 38880.6866667 -HK: 6253019.34444 -HN: 696195.986667 -HR: 9634731.65556 -HT: 89951.7466667 -HU: 27508528.3956 -ID: 19977120.5311 -IE: 8530559.23333 -IL: 6125523.57556 -IM: 144767.664444 -IN: 27692918.0956 -IO: 21.4266666667 -IQ: 844265.502222 -IR: 20045732.9222 -IS: 1593090.64 -IT: 83703072.8356 -JE: 140256.78 -JM: 375833.804444 -JO: 993150.335556 -JP: 27988334.2422 -KE: 1647671.42667 -KG: 2415359.04889 -KH: 711643.406667 -KI: 3892.54222222 -KM: 3859.51555556 -KN: 20678.1266667 -KP: 2463.49777778 -KR: 9611982.10222 -KW: 402377.588889 -KY: 91610.1333333 -KZ: 11179783.5533 -LA: 248326.228889 -LB: 568474.653333 -LC: 67230.4666667 -LI: 217418.026667 -LK: 830831.877778 -LR: 109338.006667 -LS: 22995.7488889 -LT: 10506640.4822 -LU: 2332984.10889 -LV: 10154900.8356 -LY: 150966.048889 -MA: 2381142.94889 -MC: 190155.5 -MD: 5369052.67111 -ME: 663404.133333 -MF: 15766.7111111 -MG: 413607.266667 -MH: 5420.73555556 -MK: 832677.937778 -ML: 165364.922222 -MM: 1574103.97111 -MN: 195058.542222 -MO: 226535.004444 -MP: 11891.1377778 -MQ: 361034.924444 -MR: 74424.8177778 -MS: 4853.69777778 -MT: 586558.177778 -MU: 327995.093333 -MV: 122568.173333 -MW: 90975.1466667 -MX: 37727070.8733 -MY: 3114449.34444 -MZ: 368243.097778 -NA: 157454.515556 -NC: 240829.58 -NE: 67342.48 -NF: 253.222222222 -NG: 566236.137778 -NI: 877344.76 -NL: 95809248.2356 -NO: 7864988.36222 -NP: 798218.357778 -NR: 1346.68888889 -NU: 307.917777778 -NZ: 3786275.34222 -OM: 313158.306667 -PA: 915175.135556 -PE: 11577958.7778 -PF: 161560.595556 -PG: 47218.0222222 -PH: 6965070.46 -PK: 2669556.02889 -PL: 188700107.164 -PM: 51462.8177778 -PR: 925986.406667 -PS: 350296.895556 -PT: 11851530.2422 -PW: 18346.9177778 -PY: 1779073.26889 -QA: 345872.877778 -RE: 888326.597778 -RO: 30365147.2511 -RS: 9551556.56889 -RU: 155014855.847 -RW: 196213.697778 -SA: 1861605.02667 -SB: 9961.35333333 -SC: 50707.7577778 -SD: 143548.24 -SE: 15608222.4422 -SG: 3762772.32889 -SH: 1960.12666667 -SI: 3977915.10889 -SK: 18991595.6333 -SL: 37188.2888889 -SM: 134091.466667 -SN: 441923.386667 -SO: 346586.811111 -SR: 148975.248889 -SS: 20085.78 -ST: 4658.13111111 -SV: 1096400.23556 -SX: 29970.1955556 -SY: 184978.342222 -SZ: 18843.2466667 -TC: 93588.1177778 -TD: 10838.6422222 -TG: 109304.388889 -TH: 8181045.00667 -TJ: 303382.026667 -TL: 41618.4422222 -TM: 33138.0888889 -TN: 2539957.73111 -TO: 6872.98888889 -TR: 36320266.9556 -TT: 595362.062222 -TV: 6377.35777778 -TW: 24895659.9 -TZ: 592716.151111 -UA: 71935436.2489 -UG: 371570.777778 -UM: 417.811111111 -US: 168068359.904 -UY: 3862789.72444 -UZ: 1576052.12444 -VA: 24871.3177778 -VC: 16695.1177778 -VE: 2429953.49556 -VG: 19105.4711111 -VI: 40648.4066667 -VN: 1585975.8 -VU: 30389.8666667 -WF: 3540.82888889 -WS: 18399.8555556 -XK: 40469.0288889 -YE: 117418.873333 -YT: 78763.2866667 -ZA: 6015791.69778 -ZM: 119848.686667 -ZW: 284603.042222 diff --git a/src/render.openstreetmap.yml b/src/render.openstreetmap.yml deleted file mode 100644 index 5ac474b..0000000 --- a/src/render.openstreetmap.yml +++ /dev/null @@ -1,113 +0,0 @@ -bowser: - lat: -37.8001 - lon: 144.9671 - statuscake: - - 2217312 - colour: "#bfa730" - bandwidth: 300 - ipv4: 138.44.68.106 - default: "" - preferred: - origins: - - hamilton - - hsinchu - - wellington - -odin: - lat: 52.33724625 - lon: 4.93370796776345 - statuscake: - - 3987453 - colour: "#7c1f7c" - bandwidth: 800 - ipv4: 130.117.76.15 - ipv6: 2001:978:2:2c::172:f - default: "" - preferred: - origins: - - amsterdam - -ysera: - lat: 51.5228002 - lon: -0.62151043832233 - statuscake: - - 2217313 - colour: "#412c84" - bandwidth: 800 - ipv4: 193.60.236.22 - default: "" - preferred: - origins: - - london - -scorch: - lat: 50.691197900000006 - lon: 3.2008242044777013 - statuscake: - - 5735161 - colour: "#bf8230" - bandwidth: 200 - ipv4: 176.31.235.79 - ipv6: 2001:41d0:2:fc4f::1 - default: "" - preferred: - origins: - - france - -rhaegal: - lat: 45.8082123 - lon: 15.9634238 - statuscake: - - 3343399 - colour: "#a1b92e" - bandwidth: 200 - ipv4: 161.53.248.77 - default: "" - preferred: - origins: - - osijek - - pula - -pyrene: - lat: 44.5639267 - lon: -123.274707837676 - statuscake: - - 3451753 - colour: "#269926" - bandwidth: 600 - ipv4: 140.211.167.98 - ipv6: 2605:bc80:3010:700::8cd3:a762 - default: "" - preferred: - origins: - - corvallis - - curitiba - - montreal - - sanfrancisco - - vinadelmar - -albi: - lat: 49.0537635 - lon: 2.137900275852825 - statuscake: - - 5441356 - colour: "#25567b" - bandwidth: 50 - ipv4: 51.159.53.238 - ipv6: 2001:bc8:1200:4:dac4:97ff:fe8a:9cfc - default: "" - preferred: - origins: - - france - -# Spare colours: -# -# bf6530 -# bfb830 -# 562781 -# 1f7c65 -# bf3030 -# bf9430 -# 7ab02c -# a1285f -# 2c3d82 diff --git a/src/tile.openstreetmap.yml b/src/tile.openstreetmap.yml deleted file mode 100644 index 918a6dd..0000000 --- a/src/tile.openstreetmap.yml +++ /dev/null @@ -1,287 +0,0 @@ -# Moscow, RU -# BW Limit: 1000Mb/s -moscow: - lat: 55.75 - lon: 37.617 - statuscake: - - 2217257 - - 2217258 - colour: "#8dd3c7" - bandwidth: 200 - ipv4: 5.45.248.21 - ipv6: 2a02:6b8:b010:5065::a001 - allowed: - countries: - - AZ - - BY - - EE - - GE - - KZ - - LT - - LV - - MN - continents: - - EU - denied: - countries: - - UA - preferred: - countries: - - RU - -# Amsterdam/Ede/Dronten, NL -# Amsterdam @ 52.37306,4.89222 -# Ede @ 52.0458265,5.6702011 -# Dronten @ 52.5437235,5.7050729 -# BW Limit: 1000Mb/s -netherlands: - lat: 52.20944325 - lon: 5.28121055 - colour: "#bebada" - servers: - - statuscake: - - 2217259 - - 2217260 - bandwidth: 30 - name: trogdor - ipv4: 134.90.146.26 - - statuscake: - - 5406587 - - 5406588 - bandwidth: 60 - name: takhisis - ipv4: 31.3.110.20 - ipv6: 2a03:7900:111:0:31:3:110:20 - -# Oslo, NO -# BW Limit: 1000Mb/s -oslo: - lat: 59.94944 - lon: 10.75639 - statuscake: - - 2217261 - - 2217262 - colour: "#ffffb3" - bandwidth: 30 - ipv4: 31.169.50.10 - -# Lyon/Toulouse/Rennes/Paris, FR -# Lyon @ 45.7575958,4.8323239 with BW limit of 100Mb/s -# Toulouse @ 43.6044622,1.4442469 -# Rennes @ 48.10891/-1.63459 -# Paris @ 48.8695940,2.3437840 -france: - lat: 46.603354 - lon: 1.8883335 - colour: "#fccde5" - servers: - - statuscake: - - 2217265 - - 2217266 - bandwidth: 100 - name: nepomuk - ipv4: 77.95.65.39 - ipv6: 2a03:9180:0:100::7 - - statuscake: - - 5434796 - - 5434797 - bandwidth: 40 - name: neak - ipv4: 89.234.177.142 - - statuscake: - - 5435908 - - 5435909 - bandwidth: 80 - name: meraxes - ipv4: 51.15.185.90 - ipv6: 2001:bc8:2d57:100:aa1e:84ff:fe72:e660 - preferred: - countries: - - FR - - MC - - RE - -# Falkenstein/Jena/Berlin, DE -# Falkenstein @ 50.47822,12.33607 -# Jena @ 50.9411,11.60085 -# Berlin @ -# Nuremberg @ 49.44927,11.01402 -germany: - lat: 51.0834196 - lon: 10.4234469 - colour: "#b2df8a" - servers: - - statuscake: - - 5715443 - - 5715444 - bandwidth: 80 - name: firnen - ipv4: 188.241.28.82 - allowed: - countries: - - DE - -# Pula, HR -pula: - lat: 44.866280 - lon: 13.851520 - statuscake: - - 2217279 - - 2217280 - colour: "#a6cee3" - bandwidth: 100 - ipv4: 193.198.233.211 - ipv6: 2001:b68:4cff:3::3 - -# Osijek, HR -osijek: - lat: 45.55656 - lon: 18.71212 - statuscake: - - 2217281 - - 2217282 - colour: "#fb8072" - bandwidth: 100 - ipv4: 161.53.30.107 - ipv6: 2001:b68:c0ff:0:221:5eff:fe40:c7c4 - -# Athens, GR -athens: - lat: 37.983972 - lon: 23.727806 - statuscake: - - 2244901 - - 2244902 - colour: "#b3de69" - bandwidth: 80 - ipv4: 83.212.2.116 - ipv6: 2001:648:2ffe:4::116 - -# Montréal, CA -montreal: - lat: 45.5 - lon: -73.566667 - statuscake: - - 3155163 - - 3155162 - colour: "#b15928" - bandwidth: 100 - ipv4: 184.107.48.228 - preferred: - countries: - - CA - -# Cape Town, ZA -capetown: - lat: -33.91834 - lon: 18.42054 - statuscake: - - 2217295 - - 2217296 - colour: "#cab2d6" - bandwidth: 10 - ipv4: 196.10.54.165 - ipv6: 2001:43f8:1f4:b00:b283:feff:fed8:dd45 - allowed: - countries: - - BW - - LS - - MZ - - NA - - SZ - - ZA - - ZW - -# Zurich, CH -# BW Limit: 200Mb/s -zurich: - lat: 47.3769434 - lon: 8.5414061 - statuscake: - - 3743984 - - 3743985 - colour: "#ccebc5" - bandwidth: 200 - ipv4: 217.71.244.22 - ipv6: 2001:8e0:40:2039::10 - preferred: - countries: -# - CH - - IT -# - SM -# - VA - -# Kiev, UA -kiev: - lat: 50.4020865 - lon: 30.6146803128848 - statuscake: - - 3890448 - - 3890447 - colour: "#fb9a99" - bandwidth: 70 - ipv4: 176.122.99.101 - ipv6: 2001:67c:2d40::65 - -# Pilsen/Prague, CZ -# Pilsen @ 49.723689,13.351542 -# Prague @ 50.0874654,14.4212535 -czechia: - lat: 49.9055772 - lon: 13.88639775 - colour: "#d9d9d9" - servers: - - statuscake: - - 4065539 - - 4065540 - bandwidth: 30 - name: fume - ipv4: 147.228.60.16 - allowed: - countries: - - AT - - CZ - - DE - - PL - - SK - -# Katowice, Poland -#katowice: -# lat: 50.25349 -# lon: 19.00283 -# statuscake: -# - 5715443 -# - 5715444 -# colour: "#A22E5B" -# bandwidth: 80 -# name: firnen -# ipv4: 188.241.28.82 - -# Fastly -fastly: - global: true - statuscake: [] - bandwidth: 10000 - cname: dualstack.osff2.map.fastly.net - default: "xx" - allowed: - continents: - - AF - - AN - - AS - - EU - - NA - - OC - - SA - preferred: - continents: - - AF - - AN - - AS - - EU - - NA - - OC - - SA - -# Spare colours: - colour: "#1f78b4" -- 2.39.5