From 1c7aa65e4d719412dbd8bb03c7b199f89f9075db Mon Sep 17 00:00:00 2001 From: traumschule Date: Wed, 17 Oct 2018 10:06:40 +0200 Subject: [PATCH] sort mirrors by region (#28083) --- getinvolved/en/mirrors.wml | 16 +- include/mirrors-table.wmi | 587 +++++++++++++++++++++++++++++++++++-- include/tor-mirrors.csv | 86 +++--- update-mirrors.pl | 60 ++-- 4 files changed, 655 insertions(+), 94 deletions(-) diff --git a/getinvolved/en/mirrors.wml b/getinvolved/en/mirrors.wml index 198b54f4..5f77b586 100644 --- a/getinvolved/en/mirrors.wml +++ b/getinvolved/en/mirrors.wml @@ -22,19 +22,15 @@ If you would like to run a mirror, please read our instructions for running a mirror.

+ +

Note: The update time only reflects when the mirror has been checked last.

- - - - - - - - - - + + + + #include "mirrors-table.wmi"
CountryOrganisationStatusftphttp dist/http websitehttps dist/https websitersync dist/rsync website Updatedwebdist
diff --git a/include/mirrors-table.wmi b/include/mirrors-table.wmi index b0d2a053..a4210ad0 100644 --- a/include/mirrors-table.wmi +++ b/include/mirrors-table.wmi @@ -1,34 +1,577 @@ + +

.global

+

worldwide

+ TvdW + Sun Oct 14 23:14:59 2018 + + http + + + http + + +

Asia

+

Taiwan

+ + + Department of CSE. Yuan Ze University + Sun Oct 14 23:14:59 2018 + + ftp + http + https + rsync + + + http + https + rsync + + +

Vietnam

+ + + Freedif + Tue Oct 9 16:46:15 2018 + + https + + + https + + +

Europe

+

Austria

+ + + ph3x + Sun Oct 14 23:14:59 2018 + + http + https + + + http + https + + +

France

+ + + stalkr.net + Sun Oct 14 23:14:59 2018 + + https + + + https + + + + + wardsback.org + Sun Oct 14 23:14:59 2018 + + http + + + http + + + + + Michael Armbruster + Sun Oct 14 23:14:59 2018 + + http + https + rsync + + + http + https + rsync + + + + + Standalone Installer Software + Sun Oct 14 23:14:59 2018 + + http + rsync + + + http + rsync + + + + + Tor Supporter + Sun Oct 14 23:14:59 2018 + + onion + http + https + + + http + https + + +

Germany

+ + + NetCologne GmbH + Tue Oct 16 23:14:59 2018 + + ftp + http + rsync + + + rsync + + + + + spline + Tue Oct 16 23:14:59 2018 + + ftp + http + https + rsync + + + rsync + + + + + Funkfreunde Landshut e.V. + Tue Oct 16 23:14:59 2018 + + onion + http + + + + + + + TB-ITF + Sun Oct 14 23:14:59 2018 + + http + https + + + http + https + + + + + torservers + Sun Oct 14 23:14:59 2018 + + onion + https + + + https + + + + + cYbergueRrilLa AnonyMous NeXus + Sun Oct 14 23:14:59 2018 + + https + + + https + + + + + Tor Supporter + Sun Oct 14 23:14:59 2018 + + https + + + https + + + + + Tor Supporter + Sun Oct 14 23:14:59 2018 + + http + https + + + http + https + + + + + 0x3d.lu + Sun Oct 14 23:14:59 2018 + + http + https + + + http + https + + + + + sela Internet + Sun Oct 14 23:14:59 2018 + + https + + + https + + + + + Chaos Computer Club + Sun Oct 14 23:14:59 2018 + + http + https + + + http + https + + + + + tormirror + Sun Oct 14 23:14:59 2018 + + http + + + http + + + + + Tor Supporter + Sun Oct 14 23:14:59 2018 + + http + https + + + http + https + + + + + TB-ITF + Sun Oct 14 23:14:59 2018 + + ftp + http + https + + + http + https + + + + + Tor World (torworld.org) + Sun Oct 14 23:14:59 2018 + + http + https + + + http + https + + +

Iceland

+ + + Frenn vun der Enn A.S.B.L. + Sun Oct 14 23:14:59 2018 + + onion + http + + + http + + + + + TheOnionRouter + Sun Oct 14 23:14:59 2018 + + http + + + http + + +

Netherlands

+ + + Serverius Connectivity + Tue Oct 16 23:14:59 2018 + + https + rsync + + + rsync + + + + + Hackerspace Istanbul + Sun Oct 14 23:14:59 2018 + + http + https + + + http + https + + + + + Ozgurlesin.org (hs.ist) + Sun Oct 14 23:14:59 2018 + + http + https + + + http + https + + +

Norway

+ + + nortor.no + Tue Oct 16 23:14:59 2018 + + onion + http + https + + + http + https + + + + + MultiNet AS + Sun Oct 14 23:14:59 2018 + + http + + + http + + +

Spain

+ + + Tor Supporter + Sun Oct 14 23:14:59 2018 + + http + https + + + http + https + + +

Switzerland

+ + + urown.net + Sun Oct 14 23:14:59 2018 + + onion + http + https + + + http + https + + +

Ukraine

+ + + IP-Connect LLC + Sun Oct 14 23:14:59 2018 + + ftp + http + rsync + + + http + rsync + + +

North America

+

Canada

+ + + tor@les.net + Tue Oct 16 23:14:59 2018 + + http + + + + + + + razx + Tue Oct 16 23:14:59 2018 + + onion + http + https + + + http + https + + - CA + + The Free Mirror Project + Sun Oct 14 23:14:59 2018 + + http + https + rsync + + + http + https + rsync + + +

United States

- razx + + AskApache + Sun Oct 14 23:14:59 2018 + + + + http + + - Up to date - - - onion - http - http - https - https - - - - + + EFF + Sun Oct 14 23:14:59 2018 + + https + + + https + + Setec Administrator + Sun Oct 14 23:14:59 2018 + + http + https + + + http + https + + - NO + + intfxdx.com + Sun Oct 14 23:14:59 2018 + + http + https + + + http + https + + - nortor.no + + EPRCI + Sun Oct 14 23:14:59 2018 + + http + + + http + + - Up to date - - - onion - http - http - https - https - - - - + + The Calyx Institute + Sun Oct 14 23:14:59 2018 + + onion + http + https + + + http + https + + +

Oceania

+

Australia and New Zealand

+ + + CoffsWiFi + Sun Oct 14 23:14:59 2018 + + http + + + http + diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv index 72f836d1..014bbfd2 100644 --- a/include/tor-mirrors.csv +++ b/include/tor-mirrors.csv @@ -1,45 +1,45 @@ adminContact, orgName, isoCC, subRegion, region, ipv4, ipv6, loadBalanced, httpWebsiteMirror, httpsWebsiteMirror, rsyncWebsiteMirror, ftpWebsiteMirror, httpDistMirror, httpsDistMirror, rsyncDistMirror, hiddenServiceMirror, updateDate -mirror-service@netcologne.de, NetCologne GmbH, DE, NRW, Europe, TRUE, TRUE, FALSE, http://mirror.netcologne.de/torproject.org/, , rsync://mirror.netcologne.de/torproject.org, ftp://mirror.netcologne.de/torproject.org/, , , rsync://mirror.netcologne.de/torproject.org/dist, , Thu Oct 11 16:46:15 2018 -mirrors[at]ip-connect[dot]vn[dot]ua, IP-Connect LLC, UA, Ukraine, , TRUE, TRUE, TRUE, http://torproject.ip-connect.vn.ua/, , rsync://torproject.ip-connect.vn.ua/torproject, ftp://torproject.ip-connect.vn.ua/mirror/torproject/, http://torproject.ip-connect.vn.ua/dist/, , rsync://torproject.ip-connect.vn.ua/torproject/dist, , Tue Oct 9 16:46:15 2018 -torsupport AT tb-itf DOT de, TB-ITF, DE, Germany, Europe, TRUE, TRUE, FALSE, http://tormirror.tb-itf-tor.de/, https://tormirror.tb-itf-tor.de/, , , http://tormirror.tb-itf-tor.de/dist/, https://tormirror.tb-itf-tor.de/dist/, , , Tue Oct 9 16:46:15 2018 -info /AT enn /DOT lu, Frenn vun der Enn A.S.B.L., IS, Iceland, Europe, TRUE, FALSE, FALSE, http://torproject.lu/, , , , http://torproject.lu/dist/, , , http://btn6gqzqevlhoryd.onion/, Tue Oct 9 16:46:15 2018 -http://www.multinet.no, MultiNet AS, NO, Trondheim, Europe, TRUE, TRUE, FALSE, http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Tue Oct 9 16:46:15 2018 -haskell at gmx.es, Tor Supporter, ES, Spain, Europe, TRUE, TRUE, FALSE, http://tor.zilog.es/, https://tor.zilog.es/, , , http://tor.zilog.es/dist/, https://tor.zilog.es/dist/, , , Tue Oct 9 16:46:15 2018 -Tor Fan, spline, DE, Germany, Europe, TRUE, FALSE, FALSE, http://tor.spline.de/, https://tor.spline.inf.fu-berlin.de/, rsync://ftp.spline.de/tor, ftp://ftp.spline.de/pub/tor/, , , rsync://ftp.spline.de/tor/dist, , Thu Oct 11 16:46:15 2018 -hosting AT ph3x DOT at, ph3x, AT, Austria, Europe, TRUE, FALSE, FALSE, http://torproject.ph3x.at/, https://torproject.ph3x.at/, , , http://torproject.ph3x.at/dist/, https://torproject.ph3x.at/dist/, , , Tue Oct 9 16:46:15 2018 -webmaster AT askapache DOT com, AskApache, US, California, NorthAmerica, TRUE, FALSE, FALSE, http://tor.askapache.com/, , , , http://tor.askapache.com/dist/, , , , Tue Oct 9 16:46:15 2018 -paul at coffswifi.net, CoffsWiFi, AU, Australia and New Zealand, Australia, TRUE, FALSE, FALSE, http://torproject.coffswifi.net/, , , , http://torproject.coffswifi.net/dist/, , , , Tue Oct 9 16:46:15 2018 -hostmaster AT example DOT com, TheOnionRouter, IS, Iceland, Europe, TRUE, FALSE, FALSE, http://www.theonionrouter.com/, , , , http://www.theonionrouter.com/dist/, , , , Tue Oct 9 16:46:15 2018 -Tor Fan, torservers, DE, Germany, Europe, TRUE, FALSE, FALSE, , https://www.torservers.net/mirrors/torproject.org/, , , , https://www.torservers.net/mirrors/torproject.org/dist/, , http://hbpvnydyyjbmhx6b.onion/mirrors/torproject.org/, Tue Oct 9 16:46:15 2018 -tor@les.net, tor@les.net, CA, Canada, NorthAmerica, TRUE, FALSE, FALSE, http://tor.les.net/, , , , , , , , Thu Oct 11 16:46:15 2018 -tor@stalkr.net, stalkr.net, FR, France, Europe, TRUE, TRUE, FALSE, , https://tor.stalkr.net/, , , , https://tor.stalkr.net/dist/, , , Tue Oct 9 16:46:15 2018 -doemela[AT]cyberguerrilla[DOT]org, cYbergueRrilLa AnonyMous NeXus, DE, Germany, Europe, TRUE, FALSE, FALSE, , https://tor-mirror.cyberguerrilla.org/, , , , https://tor-mirror.cyberguerrilla.org/dist/, , , Tue Oct 9 16:46:15 2018 -Tor Fan, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, FALSE, , https://mirror.velcommuta.de/tor/, , , , https://mirror.velcommuta.de/tor/dist/, , , Tue Oct 9 16:46:15 2018 -EFF, EFF, US, United States of America, NorthAmerica, TRUE, FALSE, FALSE, , https://tor.eff.org/, , , , https://tor.eff.org/dist/, , , Tue Oct 9 16:46:15 2018 -admin AT nuclear DASH weapons DOT net, Setec Administrator, US, Texas, NorthAmerica, TRUE, FALSE, FALSE, http://tor.nuclear-weapons.net/, https://tor.nuclear-weapons.net/, , , http://tor.nuclear-weapons.net/dist/, https://tor.nuclear-weapons.net/dist/, , , Tue Oct 9 16:46:15 2018 -alexander AT dietrich DOT cx, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, FALSE, http://tor.ybti.net/, https://tor.ybti.net/, , , http://tor.ybti.net/dist/, https://tor.ybti.net/dist/, , , Tue Oct 9 16:46:15 2018 -tor@0x3d.lu, 0x3d.lu, DE, Germany, Europe, TRUE, FALSE, FALSE, http://tor.0x3d.lu/, https://tor.0x3d.lu/, , , http://tor.0x3d.lu/dist/, https://tor.0x3d.lu/dist/, , , Tue Oct 9 16:46:15 2018 -James Murphy, intfxdx.com, US, United States of America, NorthAmerica, TRUE, TRUE, FALSE, http://108.248.87.242/, https://108.248.87.242/, , , http://108.248.87.242/dist/, https://108.248.87.242/dist/, , , Tue Oct 9 16:46:15 2018 -tor AT eprci NET, EPRCI, US, NH, NorthAmerica, TRUE, FALSE, FALSE, http://tor.eprci.net/, , , , http://tor.eprci.net/dist/, , , , Tue Oct 9 16:46:15 2018 -tor-admin AT wardsback DOT org, wardsback.org, FR, France, Europe, TRUE, FALSE, FALSE, http://alliumcepa.wardsback.org/, , , , http://alliumcepa.wardsback.org/dist/, , , , Tue Oct 9 16:46:15 2018 -hsu AT peterdavehellor DOT org, Department of CSE. Yuan Ze University, TW, Taiwan, Asia, TRUE, FALSE, FALSE, http://ftp.yzu.edu.tw/torproject.org/, https://ftp.yzu.edu.tw/torproject.org/, rsync://ftp.yzu.edu.tw/pub/torproject.org/, ftp://ftp.yzu.edu.tw/torproject.org/, http://ftp.yzu.edu.tw/torproject.org/dist/, https://ftp.yzu.edu.tw/torproject.org/dist/, rsync://ftp.yzu.edu.tw/pub/torproject.org/dist/, , Tue Oct 9 16:46:15 2018 -tor at tvdw dot eu, TvdW, , , , TRUE, TRUE, TRUE, http://tor-exit.network/, , , , http://tor-exit.network/dist/, , , , Tue Oct 9 16:46:15 2018 -tormaster AT urown DOT net, urown.net, CH, Switzerland, Europe, TRUE, TRUE, FALSE, http://torproject.urown.net/, https://torproject.urown.net/, , , http://torproject.urown.net/dist/, https://torproject.urown.net/dist/, , http://torprowdd64ytmyk.onion/, Tue Oct 9 16:46:15 2018 -Stefan, sela Internet, DE, Germany, Europe, TRUE, TRUE, FALSE, , https://sela.io/mirrors/torproject.org/, , , , https://sela.io/mirrors/torproject.org/dist/, , , Tue Oct 9 16:46:15 2018 -webmaster AT ccc DOT de, Chaos Computer Club, DE, Germany, Europe, TRUE, FALSE, FALSE, http://tor.ccc.de/, https://tor.ccc.de/, , , http://tor.ccc.de/dist/, https://tor.ccc.de/dist/, , , Tue Oct 9 16:46:15 2018 -tormirror0121.10.swsnyder@spamgourmet.com, tormirror, DE, Germany, Europe, FALSE, FALSE, FALSE, https://tormirror.snydernet.net/, , , , https://tormirror.snydernet.net/dist/, , , , Tue Oct 9 16:46:15 2018 -nick at calyx dot com, The Calyx Institute, US, United States of America, NorthAmerica, TRUE, FALSE, FALSE, http://tor.calyxinstitute.org/, https://tor.calyxinstitute.org/, , , http://tor.calyxinstitute.org/dist/, https://tor.calyxinstitute.org/dist/, , http://tmdrhl4e4anhsjc5.onion/, Tue Oct 9 16:46:15 2018 -tor@armbrust.me, Michael Armbruster, FR, France, Europe, TRUE, TRUE, FALSE, http://tor.armbrust.me/, https://tor.armbrust.me/, rsync://tor.armbrust.me/tor, , http://tor.armbrust.me/dist/, https://tor.armbrust.me/dist/, rsync://tor.armbrust.me/tor-dist, , Tue Oct 9 16:46:15 2018 -Tor Fan, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, FALSE, http://torproject.mirror.metalgamer.eu/, https://torproject.mirror.metalgamer.eu/, , , http://torproject.mirror.metalgamer.eu/dist/, https://torproject.mirror.metalgamer.eu/dist/, , , Tue Oct 9 16:46:15 2018 -torsupport AT tb-itf DOT de, TB-ITF, DE, Germany, Europe, TRUE, TRUE, FALSE, http://tormirror.tb-itf-tor.de/, https://tormirror.tb-itf-tor.de/, , ftp://tormirror.tb-itf-tor.de/, http://tormirror.tb-itf-tor.de/dist/, https://tormirror.tb-itf-tor.de/dist/, , , Tue Oct 9 16:46:15 2018 -admin @T standaloneinstaler.com, Standalone Installer Software, FR, France, Europe, TRUE, TRUE, FALSE, http://mirrors.standaloneinstaller.com/torproject/, , rsync://mirrors.standaloneinstaller.com/torproject/, , http://mirrors.standaloneinstaller.com/torproject/dist/, , rsync://mirrors.standaloneinstaller.com/torproject/dist, , Tue Oct 9 16:46:15 2018 +mirror-service@netcologne.de, NetCologne GmbH, DE, Germany, Europe, TRUE, TRUE, FALSE, http://mirror.netcologne.de/torproject.org/, , rsync://mirror.netcologne.de/torproject.org, ftp://mirror.netcologne.de/torproject.org/, , , rsync://mirror.netcologne.de/torproject.org/dist, , Tue Oct 16 23:14:59 2018 +mirrors[at]ip-connect[dot]vn[dot]ua, IP-Connect LLC, UA, Ukraine, Europe, TRUE, TRUE, TRUE, http://torproject.ip-connect.vn.ua/, , rsync://torproject.ip-connect.vn.ua/torproject, ftp://torproject.ip-connect.vn.ua/mirror/torproject/, http://torproject.ip-connect.vn.ua/dist/, , rsync://torproject.ip-connect.vn.ua/torproject/dist, , Sun Oct 14 23:14:59 2018 +torsupport AT tb-itf DOT de, TB-ITF, DE, Germany, Europe, TRUE, TRUE, FALSE, http://tormirror.tb-itf-tor.de/, https://tormirror.tb-itf-tor.de/, , , http://tormirror.tb-itf-tor.de/dist/, https://tormirror.tb-itf-tor.de/dist/, , , Sun Oct 14 23:14:59 2018 +info /AT enn /DOT lu, Frenn vun der Enn A.S.B.L., IS, Iceland, Europe, TRUE, FALSE, FALSE, http://torproject.lu/, , , , http://torproject.lu/dist/, , , http://btn6gqzqevlhoryd.onion/, Sun Oct 14 23:14:59 2018 +http://www.multinet.no, MultiNet AS, NO, Norway, Europe, TRUE, TRUE, FALSE, http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Sun Oct 14 23:14:59 2018 +haskell at gmx.es, Tor Supporter, ES, Spain, Europe, TRUE, TRUE, FALSE, http://tor.zilog.es/, https://tor.zilog.es/, , , http://tor.zilog.es/dist/, https://tor.zilog.es/dist/, , , Sun Oct 14 23:14:59 2018 +Tor Fan, spline, DE, Germany, Europe, TRUE, FALSE, FALSE, http://tor.spline.de/, https://tor.spline.inf.fu-berlin.de/, rsync://ftp.spline.de/tor, ftp://ftp.spline.de/pub/tor/, , , rsync://ftp.spline.de/tor/dist, , Tue Oct 16 23:14:59 2018 +hosting AT ph3x DOT at, ph3x, AT, Austria, Europe, TRUE, FALSE, FALSE, http://torproject.ph3x.at/, https://torproject.ph3x.at/, , , http://torproject.ph3x.at/dist/, https://torproject.ph3x.at/dist/, , , Sun Oct 14 23:14:59 2018 +webmaster AT askapache DOT com, AskApache, US, United States, North America, TRUE, FALSE, FALSE, , , , , http://tor.askapache.com/dist/, , , , Sun Oct 14 23:14:59 2018 +paul at coffswifi.net, CoffsWiFi, AU, Australia and New Zealand, Oceania, TRUE, FALSE, FALSE, http://torproject.coffswifi.net/, , , , http://torproject.coffswifi.net/dist/, , , , Sun Oct 14 23:14:59 2018 +hostmaster AT example DOT com, TheOnionRouter, IS, Iceland, Europe, TRUE, FALSE, FALSE, http://www.theonionrouter.com/, , , , http://www.theonionrouter.com/dist/, , , , Sun Oct 14 23:14:59 2018 +Tor Fan, torservers, DE, Germany, Europe, TRUE, FALSE, FALSE, , https://www.torservers.net/mirrors/torproject.org/, , , , https://www.torservers.net/mirrors/torproject.org/dist/, , http://hbpvnydyyjbmhx6b.onion/mirrors/torproject.org/, Sun Oct 14 23:14:59 2018 +tor@les.net, tor@les.net, CA, Canada, North America, TRUE, FALSE, FALSE, http://tor.les.net/, , , , , , , , Tue Oct 16 23:14:59 2018 +tor@stalkr.net, stalkr.net, FR, France, Europe, TRUE, TRUE, FALSE, , https://tor.stalkr.net/, , , , https://tor.stalkr.net/dist/, , , Sun Oct 14 23:14:59 2018 +doemela[AT]cyberguerrilla[DOT]org, cYbergueRrilLa AnonyMous NeXus, DE, Germany, Europe, TRUE, FALSE, FALSE, , https://tor-mirror.cyberguerrilla.org/, , , , https://tor-mirror.cyberguerrilla.org/dist/, , , Sun Oct 14 23:14:59 2018 +Tor Fan, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, FALSE, , https://mirror.velcommuta.de/tor/, , , , https://mirror.velcommuta.de/tor/dist/, , , Sun Oct 14 23:14:59 2018 +EFF, EFF, US, United States, North America, TRUE, FALSE, FALSE, , https://tor.eff.org/, , , , https://tor.eff.org/dist/, , , Sun Oct 14 23:14:59 2018 +admin AT nuclear DASH weapons DOT net, Setec Administrator, US, United States, North America, TRUE, FALSE, FALSE, http://tor.nuclear-weapons.net/, https://tor.nuclear-weapons.net/, , , http://tor.nuclear-weapons.net/dist/, https://tor.nuclear-weapons.net/dist/, , , Sun Oct 14 23:14:59 2018 +alexander AT dietrich DOT cx, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, FALSE, http://tor.ybti.net/, https://tor.ybti.net/, , , http://tor.ybti.net/dist/, https://tor.ybti.net/dist/, , , Sun Oct 14 23:14:59 2018 +tor@0x3d.lu, 0x3d.lu, DE, Germany, Europe, TRUE, FALSE, FALSE, http://tor.0x3d.lu/, https://tor.0x3d.lu/, , , http://tor.0x3d.lu/dist/, https://tor.0x3d.lu/dist/, , , Sun Oct 14 23:14:59 2018 +James Murphy, intfxdx.com, US, United States, North America, TRUE, TRUE, FALSE, http://108.248.87.242/, https://108.248.87.242/, , , http://108.248.87.242/dist/, https://108.248.87.242/dist/, , , Sun Oct 14 23:14:59 2018 +tor AT eprci NET, EPRCI, US, United States, North America, TRUE, FALSE, FALSE, http://tor.eprci.net/, , , , http://tor.eprci.net/dist/, , , , Sun Oct 14 23:14:59 2018 +tor-admin AT wardsback DOT org, wardsback.org, FR, France, Europe, TRUE, FALSE, FALSE, http://alliumcepa.wardsback.org/, , , , http://alliumcepa.wardsback.org/dist/, , , , Sun Oct 14 23:14:59 2018 +hsu AT peterdavehellor DOT org, Department of CSE. Yuan Ze University, TW, Taiwan, Asia, TRUE, FALSE, FALSE, http://ftp.yzu.edu.tw/torproject.org/, https://ftp.yzu.edu.tw/torproject.org/, rsync://ftp.yzu.edu.tw/pub/torproject.org/, ftp://ftp.yzu.edu.tw/torproject.org/, http://ftp.yzu.edu.tw/torproject.org/dist/, https://ftp.yzu.edu.tw/torproject.org/dist/, rsync://ftp.yzu.edu.tw/pub/torproject.org/dist/, , Sun Oct 14 23:14:59 2018 +tor at tvdw dot eu, TvdW, , worldwide, .global, TRUE, TRUE, TRUE, http://tor-exit.network/, , , , http://tor-exit.network/dist/, , , , Sun Oct 14 23:14:59 2018 +tormaster AT urown DOT net, urown.net, CH, Switzerland, Europe, TRUE, TRUE, FALSE, http://torproject.urown.net/, https://torproject.urown.net/, , , http://torproject.urown.net/dist/, https://torproject.urown.net/dist/, , http://torprowdd64ytmyk.onion/, Sun Oct 14 23:14:59 2018 +Stefan, sela Internet, DE, Germany, Europe, TRUE, TRUE, FALSE, , https://sela.io/mirrors/torproject.org/, , , , https://sela.io/mirrors/torproject.org/dist/, , , Sun Oct 14 23:14:59 2018 +webmaster AT ccc DOT de, Chaos Computer Club, DE, Germany, Europe, TRUE, FALSE, FALSE, http://tor.ccc.de/, https://tor.ccc.de/, , , http://tor.ccc.de/dist/, https://tor.ccc.de/dist/, , , Sun Oct 14 23:14:59 2018 +tormirror0121.10.swsnyder@spamgourmet.com, tormirror, DE, Germany, Europe, FALSE, FALSE, FALSE, https://tormirror.snydernet.net/, , , , https://tormirror.snydernet.net/dist/, , , , Sun Oct 14 23:14:59 2018 +nick at calyx dot com, The Calyx Institute, US, United States, North America, TRUE, FALSE, FALSE, http://tor.calyxinstitute.org/, https://tor.calyxinstitute.org/, , , http://tor.calyxinstitute.org/dist/, https://tor.calyxinstitute.org/dist/, , http://tmdrhl4e4anhsjc5.onion/, Sun Oct 14 23:14:59 2018 +tor@armbrust.me, Michael Armbruster, FR, France, Europe, TRUE, TRUE, FALSE, http://tor.armbrust.me/, https://tor.armbrust.me/, rsync://tor.armbrust.me/tor, , http://tor.armbrust.me/dist/, https://tor.armbrust.me/dist/, rsync://tor.armbrust.me/tor-dist, , Sun Oct 14 23:14:59 2018 +Tor Fan, Tor Supporter, DE, Germany, Europe, TRUE, TRUE, FALSE, http://torproject.mirror.metalgamer.eu/, https://torproject.mirror.metalgamer.eu/, , , http://torproject.mirror.metalgamer.eu/dist/, https://torproject.mirror.metalgamer.eu/dist/, , , Sun Oct 14 23:14:59 2018 +torsupport AT tb-itf DOT de, TB-ITF, DE, Germany, Europe, TRUE, TRUE, FALSE, http://tormirror.tb-itf-tor.de/, https://tormirror.tb-itf-tor.de/, , ftp://tormirror.tb-itf-tor.de/, http://tormirror.tb-itf-tor.de/dist/, https://tormirror.tb-itf-tor.de/dist/, , , Sun Oct 14 23:14:59 2018 +admin @T standaloneinstaler.com, Standalone Installer Software, FR, France, Europe, TRUE, TRUE, FALSE, http://mirrors.standaloneinstaller.com/torproject/, , rsync://mirrors.standaloneinstaller.com/torproject/, , http://mirrors.standaloneinstaller.com/torproject/dist/, , rsync://mirrors.standaloneinstaller.com/torproject/dist, , Sun Oct 14 23:14:59 2018 karibu@freedif.org, Freedif, VN, Vietnam, Asia, TRUE, FALSE, FALSE, , https://mirror.freedif.org/TorProject/, , , , https://mirror.freedif.org/TorProject/dist/, , , Tue Oct 9 16:46:15 2018 -mirror AT funkfreundelandshut DOT de, Funkfreunde Landshut e.V., DE, Germany, Europe, TRUE, FALSE, FALSE, http://mirror.funkfreundelandshut.de/torproject.org/, , , , , , , http://44.225.40.254/torproject.org/dist/, Thu Oct 11 16:46:15 2018 -razx.cloud, razx, CA, Canada, NorthAmerica, TRUE, FALSE, FALSE, http://tcejorprot.razx.cloud/, https://tcejorprot.razx.cloud/, , , http://tcejorprot.razx.cloud/dist/, https://tcejorprot.razx.cloud/dist/, , http://rsqiscyvxt4qgaiw.onion/torproject.org/, Thu Oct 11 16:46:15 2018 -Tor Fan, Tor Supporter, FR, France, Europe, TRUE, TRUE, FALSE, http://mirror.oldsql.cc/tor/, https://mirror.oldsql.cc/tor/, , , http://mirror.oldsql.cc/tor/dist/, https://mirror.oldsql.cc/tor/dist/, , http://oldsqlcbr3aykyta.onion/tor/, Tue Oct 9 16:46:15 2018 -Lunar, Tor World (torworld.org), DE, Germany, Europe, TRUE, FALSE, FALSE, http://mirror.torworld.org/, https://mirror.torworld.org/, , , http://mirror.torworld.org/dist/, https://mirror.torworld.org/dist/, , , Tue Oct 9 16:46:15 2018 -Merlijn de Leeuw, Serverius Connectivity, NL, Netherlands, Europe, TRUE, TRUE, FALSE, , https://mirror.serverius.net/torproject/, rsync://mirror.serverius.net/torproject, , , , rsync://mirror.serverius.net/dist, , Thu Oct 11 16:46:15 2018 -iletisim at hackerspace.ist, Hackerspace Istanbul, NL, Netherlands, Europe, TRUE, FALSE, FALSE, http://tor.hackerspace.ist/, https://tor.hackerspace.ist/, , , http://tor.hackerspace.ist/dist/, https://tor.hackerspace.ist/dist/, , , Tue Oct 9 16:46:15 2018 -iletisim at hackerspace.ist, Ozgurlesin.org (hs.ist), NL, Netherlands, Europe, TRUE, FALSE, FALSE, http://tor.ozgurlesin.org/, https://tor.ozgurlesin.org/, , , http://tor.ozgurlesin.org/dist/, https://tor.ozgurlesin.org/dist/, , , Tue Oct 9 16:46:15 2018 -stian at nortor.no, nortor.no, NO, Norway, Europe, TRUE, TRUE, FALSE, http://mirror.nortor.no/, https://mirror.nortor.no/, , , http://mirror.nortor.no/dist/, https://mirror.nortor.no/dist/, , http://t6phizbufdw7fqgy.onion/, Thu Oct 11 16:46:15 2018 -adam.quenneville AT freemirror.org,The Free Mirror Project,CA,Canada,NorthAmerica,TRUE,FALSE,FALSE,http://mirror1.freemirror.org/tor/torproject.org/,https://mirror1.freemirror.org/tor/torproject.org/,rsync://mirror1.freemirror.org/tor-www,,http://mirror1.freemirror.org/tor/dist/,https://mirror1.freemirror.org/tor/dist/,rsync://mirror1.freemirror.org/tor-dist,, +mirror AT funkfreundelandshut DOT de, Funkfreunde Landshut e.V., DE, Germany, Europe, TRUE, FALSE, FALSE, http://mirror.funkfreundelandshut.de/torproject.org/, , , , , , , http://44.225.40.254/torproject.org/dist/, Tue Oct 16 23:14:59 2018 +razx.cloud, razx, CA, Canada, North America, TRUE, FALSE, FALSE, http://tcejorprot.razx.cloud/, https://tcejorprot.razx.cloud/, , , http://tcejorprot.razx.cloud/dist/, https://tcejorprot.razx.cloud/dist/, , http://rsqiscyvxt4qgaiw.onion/torproject.org/, Tue Oct 16 23:14:59 2018 +Tor Fan, Tor Supporter, FR, France, Europe, TRUE, TRUE, FALSE, http://mirror.oldsql.cc/tor/, https://mirror.oldsql.cc/tor/, , , http://mirror.oldsql.cc/tor/dist/, https://mirror.oldsql.cc/tor/dist/, , http://oldsqlcbr3aykyta.onion/tor/, Sun Oct 14 23:14:59 2018 +Lunar, Tor World (torworld.org), DE, Germany, Europe, TRUE, FALSE, FALSE, http://mirror.torworld.org/, https://mirror.torworld.org/, , , http://mirror.torworld.org/dist/, https://mirror.torworld.org/dist/, , , Sun Oct 14 23:14:59 2018 +Merlijn de Leeuw, Serverius Connectivity, NL, Netherlands, Europe, TRUE, TRUE, FALSE, , https://mirror.serverius.net/torproject/, rsync://mirror.serverius.net/torproject, , , , rsync://mirror.serverius.net/dist, , Tue Oct 16 23:14:59 2018 +iletisim at hackerspace.ist, Hackerspace Istanbul, NL, Netherlands, Europe, TRUE, FALSE, FALSE, http://tor.hackerspace.ist/, https://tor.hackerspace.ist/, , , http://tor.hackerspace.ist/dist/, https://tor.hackerspace.ist/dist/, , , Sun Oct 14 23:14:59 2018 +iletisim at hackerspace.ist, Ozgurlesin.org (hs.ist), NL, Netherlands, Europe, TRUE, FALSE, FALSE, http://tor.ozgurlesin.org/, https://tor.ozgurlesin.org/, , , http://tor.ozgurlesin.org/dist/, https://tor.ozgurlesin.org/dist/, , , Sun Oct 14 23:14:59 2018 +stian at nortor.no, nortor.no, NO, Norway, Europe, TRUE, TRUE, FALSE, http://mirror.nortor.no/, https://mirror.nortor.no/, , , http://mirror.nortor.no/dist/, https://mirror.nortor.no/dist/, , http://t6phizbufdw7fqgy.onion/, Tue Oct 16 23:14:59 2018 +adam.quenneville AT freemirror.org, The Free Mirror Project, CA, Canada, North America, TRUE, FALSE, FALSE, http://mirror1.freemirror.org/tor/torproject.org/, https://mirror1.freemirror.org/tor/torproject.org/, rsync://mirror1.freemirror.org/tor-www, , http://mirror1.freemirror.org/tor/dist/, https://mirror1.freemirror.org/tor/dist/, rsync://mirror1.freemirror.org/tor-dist, , Sun Oct 14 23:14:59 2018 diff --git a/update-mirrors.pl b/update-mirrors.pl index 01eb2296..1a20cf39 100755 --- a/update-mirrors.pl +++ b/update-mirrors.pl @@ -54,7 +54,7 @@ sub print_help { "help" => sub { &print_help } ) or die "Error parsing arguments. Please try again.\n"; -my (@columns, @torfiles, %randomtorfiles, %failures); +my (@columns, @torfiles, %randomtorfiles, %failures, %regions); # Functions @@ -143,7 +143,6 @@ sub FindVersion { sub Fetch { my ($ua, $url, $sub) = @_; if (! $url || $url eq '') { die "Fetch: called with empty URL.\n"; } - STDOUT->autoflush(1); # unbuffer stdout to show progress print "\nGET $url: "; my $request = new HTTP::Request GET => "$url"; my $result = $ua->request($request); @@ -228,26 +227,29 @@ sub DumpMirrors { sub PrintServer { my ($server, $fh) = @_; - print $fh "\n\n - $server->{isoCC}\n - $server->{orgName}\n - Up to date\n"; + print $fh "\n\n\t$server->{orgName}\n\t$server->{updateDate}\n"; - my %prettyNames = ( # TODO make this accessible + my %web = ( httpWebsiteMirror => "http", httpsWebsiteMirror => "https", ftpWebsiteMirror => "ftp", rsyncWebsiteMirror => "rsync", + hiddenServiceMirror => "onion"); + my %dist = ( httpDistMirror => "http", httpsDistMirror => "https", - rsyncDistMirror => "rsync", - hiddenServiceMirror => "onion"); - - foreach my $precious ( sort keys %prettyNames ) { - if ($server->{$precious}) { - print $fh " {$precious} . "\">" . - "$prettyNames{$precious}\n"; - } else { print $fh " - \n"; } + rsyncDistMirror => "rsync"); + + foreach my $type (\%web, \%dist) { + print $fh "\t\n"; + foreach my $protocol ( sort keys %$type ) { + if ($server->{$protocol}) { + my $url = $server->{$protocol}; + my $tag = $type->{$protocol}; + print $fh "\t\t$tag\n"; + } + } + print $fh "\t\n"; } print $fh "\n"; } @@ -258,6 +260,7 @@ sub PrintServer { my $secperday = 86400; my $trace_path = 'project/trace/www-master.torproject.org'; my $download_path = 'download/download.html.en'; +STDOUT->autoflush(1); # unbuffer stdout to show progress my @m = LoadMirrors(\@columns); # Init LWP @@ -314,7 +317,6 @@ sub PrintServer { } for my $server (@m) { - foreach my $field (qw/ipv4 ipv6 loadBalanced/) { # unify boolean values unless ($server->{$field} =~ /TRUE|FALSE/) { $server->{$field} = ($server->{$field} =~ /yes|true|1/i) ? 'TRUE' : 'FALSE'; @@ -390,6 +392,7 @@ sub PrintServer { } } else { die "Unrecognized server type: $serverType\n"; } } + push (@{$regions{ $server->{region} }{ $server->{subRegion} } }, $server); } # TODO we could also check rsync @@ -409,10 +412,29 @@ sub PrintServer { # open wmi for writing open (my $wmifh, '>', $opts{'wmifile'}) or die "Can't write $opts{'wmifile'}: $!"; - +$wmifh->autoflush(1); # unbuffer stdout to show progress # Print server list sorted from last known recent update to unknown update times -foreach my $server ( sort { $b->{updateDate} <=> $a->{updateDate} } grep {$_->{updateDate} && $_->{updateDate} > $tortime && $_->{sigMatched}} @m ) { - PrintServer($server, $wmifh); +# TODO We want to have this sorted by region https://bugs.torproject.org/28083 + +print $wmifh "\n"; + +foreach my $region (sort keys %regions) { + print $wmifh "

$region

\n"; + foreach my $subregion (sort keys %{$regions{$region}}) { + print $wmifh "

$subregion

\n"; +# foreach my $server ( sort { $b->{updateDate} <=> $a->{updateDate} } grep {$_->{updateDate} && $_->{updateDate} > $tortime } @{$regions{$region}{$subregion}} ) { + foreach my $server ( sort { $b->{updateDate} <=> $a->{updateDate} } @{$regions{$region}{$subregion}} ) { + PrintServer($server, $wmifh); + } + } } DumpMirrors(\@columns, $tortime - 31*$secperday, @m); close($wmifh);