diff --git a/include/mirrors-table.wmi b/include/mirrors-table.wmi index b96de062..46333827 100644 --- a/include/mirrors-table.wmi +++ b/include/mirrors-table.wmi @@ -16,23 +16,6 @@ - - - - DK - - Zentrum der Gesundheit - - Up to date - - - - http - http - - - - - - - - - - NO @@ -358,17 +341,34 @@ - MX + LT Up to date - - http - http - https - https + http + http + - + - + - + - + + + + + US + + AskApache + + Up to date + + - + http + http + - + - - - @@ -475,23 +475,6 @@ - - - - NL - - Amorphis - - Up to date - - - - http - http - - - - - - - - - - US @@ -662,6 +645,23 @@ rsync + + + US + + + + Up to date + + ftp + http + - + - + - + rsync + - + + DE @@ -730,23 +730,6 @@ - - - - SE - - homosu - - Up to date - - - - http - http - - - - - - - - - - IS @@ -764,6 +747,57 @@ - + + + DK + + Zentrum der Gesundheit + + Up to date + + - + http + http + - + - + - + - + + + + + NL + + Amorphis + + Up to date + + - + http + http + - + - + - + - + + + + + SE + + homosu + + Up to date + + - + http + http + - + - + - + - + + ES @@ -780,326 +814,3 @@ - - - - - - LT - - - - Up to date - - - - http - http - - - - - - - - - - - - - US - - AskApache - - Up to date - - - - http - http - - - - - - - - - - - - - US - - - - Unknown - - - - http - http - - - - - - - - - - - - - US - - - - Unknown - - - - http - http - https - https - rsync - rsync - - - - - DE - - - - Unknown - - - - http - http - - - - - - - - - - - - - LU - - - - Unknown - - - - http - http - - - - - - - - - - - - - UA - - - - Unknown - - - - http - http - - - - - - - - - - - - - FR - - - - Unknown - - - - http - http - - - - - - - - - - - - - US - - - - Unknown - - - - http - http - - - - - - - - - - - - - UK - - - - Unknown - - - - http - http - - - - - - - - - - - - - DE - - tor-mirror.de - - Unknown - - - - http - http - https - https - - - - - - - - - DE - - [[:bbs:]] - - Unknown - - - - http - http - https - https - - - - - - - - - US - - - - Unknown - - - - http - - - - - - - - - - - - - - - US - - NW Linux - - Unknown - - - - http - http - - - - - rsync - rsync - - - - - NL - - - - Unknown - - - - - - - - https - - - - - - - - - - - FR - - LazyTiger - - Unknown - - - - http - http - - - - - - - - - - - - - EE - - - - Unknown - - - - http - http - https - https - - - - - - - - - US - - Xpdm - - Failed signature check - - - - http - http - https - https - - - - - - - - - US - - - - Failed signature check - - ftp - http - - - - - - - rsync - - - diff --git a/include/tor-mirrors.csv b/include/tor-mirrors.csv index 63d82831..8bf4325a 100644 --- a/include/tor-mirrors.csv +++ b/include/tor-mirrors.csv @@ -1,9 +1,9 @@ adminContact, orgName, isoCC, subRegion, region, ipv4, ipv6, loadBalanced, httpWebsiteMirror, httpsWebsiteMirror, rsyncWebsiteMirror, ftpWebsiteMirror, httpDistMirror, httpsDistMirror, rsyncDistMirror, hiddenServiceMirror, updateDate , , US, , US, True, False, No, http://mirror.nametoday.me/tor/, , , , http://mirror.nametoday.me/tor/dist/, , , , Thu Dec 5 03:59:24 2013 -, , US, , US, True, True, No, http://tor.loritsu.com/, , , , http://tor.loritsu.com/dist/, , , , +, , US, , US, True, True, No, http://tor.loritsu.com/, , , , http://tor.loritsu.com/dist/, , , , info AT zentrum-der-gesundheit DOT de, Zentrum der Gesundheit, DK, , Europe, True, False, Unknown, http://tor.idnr.ws/, , , , http://tor.idnr.ws/dist/, , , , Wed Dec 4 07:16:29 2013 http://www.multinet.no, MultiNet AS, NO, Trondheim, Trondheim, True, True, No, http://tor.multinet.no/, , , , http://tor.multinet.no/dist/, , , , Thu Dec 5 03:59:24 2013 -, , US, , US, True, False, No, http://tor.mirrors.whitedholdings.org/, https://tor.mirrors.whitedholdings.org/, rsync://mirrors.whitedholdings.org/tor, , http://tor.mirrors.whitedholdings.org/dist/, https://tor.mirrors.whitedholdings.org/dist/, rsync://tor.mirrors.whitedholdings.org/tor-dist, , +, , US, , US, True, False, No, http://tor.mirrors.whitedholdings.org/, https://tor.mirrors.whitedholdings.org/, rsync://mirrors.whitedholdings.org/tor, , http://tor.mirrors.whitedholdings.org/dist/, https://tor.mirrors.whitedholdings.org/dist/, rsync://tor.mirrors.whitedholdings.org/tor-dist, , haskell at gmx.es, , ES, Spain, Europe, True, False, No, http://tor.zilog.es/, , , , http://tor.zilog.es/dist/, , , , Wed Dec 4 07:16:29 2013 webmaster AT bbln DOT nl, BBLN, NL, The Netherlands, Europe, True, True, No, http://t02.nl/mirror/, , , , http://t02.nl/mirror/dist/, , , , Thu Dec 5 03:59:24 2013 , , US, , US, True, False, No, http://199.175.55.215/, , , , http://199.175.55.215/dist/, , , , Thu Dec 5 03:59:24 2013 @@ -17,26 +17,26 @@ security AT hostoffice DOT hu, Unknown, HU, Hungary, Europe, True, False, No, ht webmaster AT ccc DOT de, CCC, NL, , Europe, True, False, Unknown, http://tor.ccc.de/, , , , http://tor.ccc.de/dist/, , , , Thu Dec 5 03:59:24 2013 , searchprivate, US, TX, US, True, False, No, http://tor.searchprivate.com/, , , , http://tor.searchprivate.com/dist/, , , , Sun Jul 29 23:49:26 2012 , , AT, , AT, True, True, No, http://tor.dont-know-me.at/, , , , http://tor.dont-know-me.at/dist/, , , , Thu Dec 5 03:59:24 2013 -marz.michael at gmail.com, , DE, , , True, False, No, http://tor.taskserver.de/, , , , http://tor.taskserver.de/dist/, , , , -, , LU, , LU, True, False, No, http://torproject.adamas.ai/, , , , http://torproject.adamas.ai/dist/, , , , +marz.michael at gmail.com, , DE, , , True, False, No, http://tor.taskserver.de/, , , , http://tor.taskserver.de/dist/, , , , +, , LU, , LU, True, False, No, http://torproject.adamas.ai/, , , , http://torproject.adamas.ai/dist/, , , , mirror ntzk de, Netzkonstrukt Berlin, DE, Germany, Europe, True, False, No, http://mirror.ntzk.de/torproject.org/, , , , http://mirror.ntzk.de/torproject.org/dist/, , , , Sun Dec 1 03:54:10 2013 -coralcdn.org, CoralCDN, INT, , INT, True, False, Yes, http://www.torproject.org.nyud.net/, , , , http://www.torproject.org.nyud.net/dist/, , , , +coralcdn.org, CoralCDN, INT, , INT, True, False, Yes, http://www.torproject.org.nyud.net/, , , , http://www.torproject.org.nyud.net/dist/, , , , , , US, , US, True, True, No, http://mirror.nametoday.me/tor/, , , , http://mirror.nametoday.me/tor/dist/, , , , Thu Dec 5 03:59:24 2013 , , AT, , AT, True, False, No, http://torproject.ph3x.at/, , , , http://torproject.ph3x.at/dist/, , , , Thu Dec 5 03:59:24 2013 info /AT enn /DOT lu, Frenn vun der Enn A.S.B.L., IS, Iceland, Europe, True, False, No, http://torproject.lu/, , , , http://torproject.lu/dist/, , , http://btn6gqzqevlhoryd.onion, Thu Dec 5 03:59:24 2013 , , CH, , CH, True, False, No, http://torproject.pillo-srv.ch/, https://torproject.pillo-srv.ch/, , , http://torproject.pillo-srv.ch/dist/, https://torproject.pillo-srv.ch/dist/, , , Thu Dec 5 03:59:24 2013 neutrino8 AT gmail DOT com, teambelgium, BE, Belgium, Europe, True, False, No, http://tor.teambelgium.net:8082/, , , ftp://tor.teambelgium.net:2121/torproject/, http://tor.teambelgium.net:8082/dist/, , , , Thu Dec 5 03:59:24 2013 tormaster AT xpdm DOT us, Xpdm, US, , North America, True, False, Unknown, http://torproj.xpdm.us/, https://torproj.xpdm.us/, , , http://torproj.xpdm.us/dist/, https://torproj.xpdm.us/dist/, , http://h3prhz46uktgm4tt.onion/, Thu Dec 5 03:59:24 2013 -, , UA, , UA, True, False, No, http://torua.reactor-xg.kiev.ua/, , , , http://torua.reactor-xg.kiev.ua/dist/, , , , +, , UA, , UA, True, False, No, http://torua.reactor-xg.kiev.ua/, , , , http://torua.reactor-xg.kiev.ua/dist/, , , , mail AT benjamin-meier DOT info, beme it, DE, , DE, True, False, No, http://tor.beme-it.de/, https://tor.beme-it.de/, rsync://tor.beme-it.de/tor, , http://tor.beme-it.de/dist/, https://tor.beme-it.de/dist/, rsync://tor.beme-it.de/tor/dist, , Thu Dec 5 03:59:24 2013 wollomatic at posteo.eu, , DE, Germany, Europe, True, True, No, http://tormirror.almnet.de/, https://tormirror.almnet.de/, , , http://tormirror.almnet.de/dist/, https://tormirror.almnet.de/dist/, , , Thu Dec 5 03:59:24 2013 , , LT, , LT, True, False, No, http://tor.vesta.nu/, , , , http://tor.vesta.nu/dist/, , , , Thu Dec 5 03:59:24 2013 , , MX, , MX, True, False, No, http://fbnaia.homelinux.net/torproject/, https://fbnaia.homelinux.net/torproject/, , , http://fbnaia.homelinux.net/torproject/dist/, https://fbnaia.homelinux.net/torproject//dist/, , , Thu Dec 5 03:59:24 2013 -, , FR, , , True, False, No, http://37.187.0.127/tormirror/, , , , http://37.187.0.127/tormirror/dist/, , , , -, , US, , US, True, False, No, http://tor.minibofh.org/, , , , http://tor.minibofh.org/dist/, , , , -, , UK, , UK, True, False, No, http://tor.mage.me.uk/, , , , http://tor.mage.me.uk/dist/, , , , +, , FR, , , True, False, No, http://37.187.0.127/tormirror/, , , , http://37.187.0.127/tormirror/dist/, , , , +, , US, , US, True, False, No, http://tor.minibofh.org/, , , , http://tor.minibofh.org/dist/, , , , +, , UK, , UK, True, False, No, http://tor.mage.me.uk/, , , , http://tor.mage.me.uk/dist/, , , , webmaster AT askapache DOT com, AskApache, US, California, US, True, False, No, http://tor.askapache.com/, , , , http://tor.askapache.com/dist/, , , , Thu Dec 5 03:59:24 2013 -nsane2307 eml cc, tor-mirror.de, DE, Germany, Europe, True, False, No, http://tor-mirror.de/, https://tor-mirror.de/, , , http://tor-mirror.de/dist/, https://tor-mirror.de/dist/, , , +nsane2307 eml cc, tor-mirror.de, DE, Germany, Europe, True, False, No, http://tor-mirror.de/, https://tor-mirror.de/, , , http://tor-mirror.de/dist/, https://tor-mirror.de/dist/, , , , hessmo, US, , US, True, False, No, http://mirror.hessmo.com/tor/, , , , http://mirror.hessmo.com/tor/dist/, , , , Thu Dec 5 03:59:24 2013 , , DE, , DE, True, False, No, http://tor.dev-random.de/, https://tor.dev-random.de/, , , http://tor.dev-random.de/dist/, https://tor.dev-random.de/dist/, , , Thu Dec 5 03:59:24 2013 , India Tor Fans, IN, , IN, True, False, No, http://www.torproject.org.in/, , , , http://www.torproject.org.in/dist/, , , , Mon Nov 25 18:31:18 2013 @@ -46,9 +46,9 @@ http://sebastian.pfeifer.or.at/, TechAsk.IT, AT, Favoriten, Wien, True, True, No BarkerJr AT barkerjr DOT net, BarkerJr, FR, , FR, True, False, No, http://www.oignon.net/, https://www.oignon.net/, , , http://www.oignon.net/dist/, https://www.oignon.net/dist/, , , Thu Dec 5 03:59:24 2013 root AT amorphis DOT eu, Amorphis, NL, , Europe, True, False, Unknown, http://tor.amorphis.eu/, , , , http://tor.amorphis.eu/dist/, , , , Wed Dec 4 22:13:02 2013 hackthissite.org, HackThisSite.org, US, , US, True, True, No, http://tor.hackthissite.org/, https://tor.hackthissite.org/, , , http://mirror.hackthissite.org/tor, https://mirror.hackthissite.org/tor, , , Thu Dec 5 03:59:24 2013 -citizen428 AT gmail DOT com, [[:bbs:]], DE, , Europe, True, False, Unknown, http://tor.blingblingsquad.net/, https://tor.blingblingsquad.net/, , , http://tor.blingblingsquad.net/dist/, https://tor.blingblingsquad.net/dist/, , , -, , DE, , DE, True, False, No, http://tor.linuxlounge.net/, https://tor.linuxlounge.net/, , , http://tor.linuxlounge.net/dist/, https://tor.linuxlounge.net/dist/, , , -, , US, , US, True, False, No, , , , , http://www.netgull.com/torproject/, , , , +citizen428 AT gmail DOT com, [[:bbs:]], DE, , Europe, True, False, Unknown, http://tor.blingblingsquad.net/, https://tor.blingblingsquad.net/, , , http://tor.blingblingsquad.net/dist/, https://tor.blingblingsquad.net/dist/, , , +, , DE, , DE, True, False, No, http://tor.linuxlounge.net/, https://tor.linuxlounge.net/, , , http://tor.linuxlounge.net/dist/, https://tor.linuxlounge.net/dist/, , , +, , US, , US, True, False, No, , , , , http://www.netgull.com/torproject/, , , , paul at coffswifi.net, CoffsWiFi, AU, Australia and New Zealand, APNIC, True, False, No, http://torproject.coffswifi.net, , , , http://torproject.coffswifi.net/dist, , , , Thu Dec 5 03:59:24 2013 , cyberarmy, AT, , AT, True, False, No, http://tor.cyberarmy.at/, , , , , , , , Thu Dec 5 03:59:24 2013 , , DE, , DE, True, False, No, http://torproject.cryptowars.info/, https://torproject.cryptowars.info/, rsync://torproject.cryptowars.info/, , http://torproject.cryptowars.info/dist/, https://torproject.cryptowars.info/dist/, , , Thu Dec 5 03:59:24 2013 @@ -58,13 +58,13 @@ hostmaster AT zombiewerks DOT com, TheOnionRouter, IS, , Iceland, True, False, U , chaos darmstadt, DE, Germany, Europe, True, False, No, http://mirrors.chaos-darmstadt.de/tor-mirror/, , , , http://mirrors.chaos-darmstadt.de/tor-mirror/dist/, , , , Thu Dec 5 03:59:24 2013 , Soviet Anonymous, RU, , RU, True, False, No, http://creep.im/tor, https://creep.im/tor, rsync://creep.im/tor, ftp://creep.im/mirrors/tor, http://creep.im/tor/dist/, https://creep.im/tor/dist/, rsync://creep.im/tor-dist, , Thu Dec 5 03:59:24 2013 , , US, , US, True, False, No, , , , ftp://mirrors.go-parts.com/tor/, http://mirrors.go-parts.com/tor/dist/, , rsync://mirrors.go-parts.com/mirrors/tor/, , Thu Dec 5 03:59:24 2013 -, NW Linux, US, WA, US, True, False, No, http://torproject.nwlinux.us/, , rsync://nwlinux.us/tor-web, , http://torproject.nwlinux.us/dist/, , rsync://nwlinux.us/tor-dist, , +, NW Linux, US, WA, US, True, False, No, http://torproject.nwlinux.us/, , rsync://nwlinux.us/tor-web, , http://torproject.nwlinux.us/dist/, , rsync://nwlinux.us/tor-dist, , , torservers, DE, , DE, True, False, No, http://www.torservers.net/mirrors/torproject.org/, https://www.torservers.net/mirrors/torproject.org/, , , http://www.torservers.net/mirrors/torproject.org/dist/, https://www.torservers.net/mirrors/torproject.org/dist/, , http://hbpvnydyyjbmhx6b.onion/mirrors/torproject.org/, Thu Dec 5 03:59:24 2013 -, , NL, , NL, True, False, No, , , , , , https://www.coevoet.nl/tor/dist/, , , +, , NL, , NL, True, False, No, , , , , , https://www.coevoet.nl/tor/dist/, , , , torland, GB, , GB, True, False, No, http://mirror.torland.me/torproject.org/, https://mirror.torland.me/torproject.org/, , , http://mirror.torland.me/torproject.org/dist/, https://mirror.torland.me/torproject.org/dist/, , , Thu Dec 5 03:59:24 2013 , , FR, , FR, True, False, No, http://torproject.c3l.lu/, , , , http://torproject.c3l.lu/dist/, , , , Thu Dec 5 03:59:24 2013 , Lightning-bolt.net, CZ, , CZ, True, False, No, http://torproject.lightning-bolt.net/, , , , http://torproject.lightning-bolt.net/dist/, , , , Thu Dec 5 03:59:24 2013 -, LazyTiger, FR, , FR, True, False, No, http://tor.taiga-san.net/, , , , http://tor.taiga-san.net/dist/, , , , -, , EE, , EE, True, False, No, http://tor.li/, https://tor.li/, , , http://tor.li/dist/, https://tor.li/dist/, , , +, LazyTiger, FR, , FR, True, False, No, http://tor.taiga-san.net/, , , , http://tor.taiga-san.net/dist/, , , , +, , EE, , EE, True, False, No, http://tor.li/, https://tor.li/, , , http://tor.li/dist/, https://tor.li/dist/, , , , homosu, SE, , SE, True, False, No, http://tor.homosu.net/, , , , http://tor.homosu.net/dist/, , , , Wed Dec 4 07:16:29 2013 IceBear, myRL.net, IS, , IS, True, False, No, http://tor.myrl.net/, https://tor.myrl.net/, , , http://tor.myrl.net/dist/, https://tor.myrl.net/dist/, , , Thu Dec 5 03:59:24 2013 diff --git a/update-mirrors.pl b/update-mirrors.pl index b7811f13..088903cd 100755 --- a/update-mirrors.pl +++ b/update-mirrors.pl @@ -121,7 +121,7 @@ sub LoadMirrors { sub DumpMirrors { my @m = @_; - open(CSV, ">", "tor-mirrors.csv") or die "Cannot open tor-mirrors.csv: $!"; + open(CSV, ">", "include/tor-mirrors.csv") or die "Cannot open tor-mirrors.csv: $!"; print CSV join(", ", @columns) . "\n"; foreach my $server(@m) { $server->{updateDate} = gmtime($server->{updateDate}) if ($server->{updateDate}); @@ -153,7 +153,7 @@ print "Using these files for sig matching:\n"; print join("\n", keys %randomtorfiles); print "\n"; -# Adjust offical Tor time by out-of-date offset: number of days * seconds per day +# Adjust official Tor time by out-of-date offset: number of days * seconds per day $tortime -= 1 * 172800; print "The official time for Tor is $tortime. \n"; @@ -184,15 +184,11 @@ for(my $server = 0; $server < scalar(@m); $server++) { sub PrintServer { my $server = shift; - my $time; - if ( $server->{updateDate} && $server->{sigMatched} ) { $time = "Up to date"; } - elsif (!$server->{updateDate}) { $time = "Unknown"; } - else { $time = "Failed signature check"; } print OUT <<"END"; \n\n $server->{isoCC}\n $server->{orgName}\n - $time\n + Up to date\n END my %prettyNames = ( @@ -224,13 +220,6 @@ open(OUT, "> $outFile") or die "Can't open $outFile: $!"; foreach my $server ( sort { $b->{updateDate} <=> $a->{updateDate} } grep {$_->{updateDate} && $_->{updateDate} > $tortime && $_->{sigMatched}} @m ) { PrintServer($server); } -foreach my $server ( grep {!$_->{updateDate}} @m ) { - PrintServer($server); -} -foreach my $server ( grep {!$_->{sigMatched} && $_->{updateDate} && $_->{updateDate} > $tortime} @m ) { - PrintServer($server); -} -# That leaves those servers whose updateDate < torTime. Check the csv for those. DumpMirrors(@m);