[tor-commits] r25181: {website} update the list of mirrors with correct urls, update the sta (in website/trunk: . include)
Andrew Lewman
andrew at torproject.org
Sat Oct 22 20:58:30 UTC 2011
Author: phobos
Date: 2011-10-22 20:58:30 +0000 (Sat, 22 Oct 2011)
New Revision: 25181
Modified:
website/trunk/include/mirrors-table.wmi
website/trunk/update-mirrors.pl
Log:
update the list of mirrors with correct urls, update the status of mirrors.
Modified: website/trunk/include/mirrors-table.wmi
===================================================================
--- website/trunk/include/mirrors-table.wmi 2011-10-22 17:58:04 UTC (rev 25180)
+++ website/trunk/include/mirrors-table.wmi 2011-10-22 20:58:30 UTC (rev 25181)
@@ -1,42 +1,8 @@
<tr>
- <td>TN</td>
-
- <td></td>
-
- <td>Up to date</td>
-
- <td> - </td>
- <td><a href="http://tor.mirror.tn/dist/">http</a></td>
- <td><a href="http://tor.mirror.tn/">http</a></td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
-</tr>
-
-<tr>
-
<td>NL</td>
- <td>Amorphis</td>
-
- <td>Up to date</td>
-
- <td> - </td>
- <td><a href="http://tor.amorphis.eu/dist/">http</a></td>
- <td><a href="http://tor.amorphis.eu/">http</a></td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
-</tr>
-
-<tr>
-
- <td>NL</td>
-
<td></td>
<td>Up to date</td>
@@ -103,23 +69,6 @@
<tr>
- <td>IS</td>
-
- <td>torproject.is</td>
-
- <td>Up to date</td>
-
- <td> - </td>
- <td><a href="http://torproject.is/dist">http</a></td>
- <td><a href="http://torproject.is/">http</a></td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
-</tr>
-
-<tr>
-
<td>US</td>
<td>BarkerJr</td>
@@ -144,9 +93,9 @@
<td>Up to date</td>
<td> - </td>
- <td><a href="http://www.torservers.net/mirrors/torproject.org/dist">http</a></td>
+ <td><a href="http://www.torservers.net/mirrors/torproject.org/dist/">http</a></td>
<td><a href="http://www.torservers.net/mirrors/torproject.org/">http</a></td>
- <td><a href="https://www.torservers.net/mirrors/torproject.org/dist">https</a></td>
+ <td><a href="https://www.torservers.net/mirrors/torproject.org/dist/">https</a></td>
<td><a href="https://www.torservers.net/mirrors/torproject.org/">https</a></td>
<td> - </td>
<td> - </td>
@@ -178,10 +127,10 @@
<td>Up to date</td>
<td><a href="ftp://key-server.org/tor">ftp</a></td>
- <td><a href="http://tor.key-server.org/dist">http</a></td>
- <td><a href="http://tor.key-server.org">http</a></td>
- <td><a href="https://tor.key-server.org/dist">https</a></td>
- <td><a href="https://tor.key-server.org">https</a></td>
+ <td><a href="http://tor.key-server.org/dist/">http</a></td>
+ <td><a href="http://tor.key-server.org/">http</a></td>
+ <td><a href="https://tor.key-server.org/dist/">https</a></td>
+ <td><a href="https://tor.key-server.org/">https</a></td>
<td> - </td>
<td> - </td>
</tr>
@@ -229,8 +178,8 @@
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.cyberarmy.at/dist">http</a></td>
- <td><a href="http://tor.cyberarmy.at">http</a></td>
+ <td><a href="http://tor.cyberarmy.at/dist/">http</a></td>
+ <td><a href="http://tor.cyberarmy.at/">http</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -246,8 +195,8 @@
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.searchprivate.com/dist">http</a></td>
- <td><a href="http://tor.searchprivate.com">http</a></td>
+ <td><a href="http://tor.searchprivate.com/dist/">http</a></td>
+ <td><a href="http://tor.searchprivate.com/">http</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -275,23 +224,6 @@
<td>DE</td>
- <td>factor.cc</td>
-
- <td>Up to date</td>
-
- <td> - </td>
- <td><a href="http://tor.factor.cc/dist/">http</a></td>
- <td><a href="http://tor.factor.cc/">http</a></td>
- <td><a href="https://factor.cc/tor/dist/">https</a></td>
- <td><a href="https://factor.cc/tor">https</a></td>
- <td> - </td>
- <td> - </td>
-</tr>
-
-<tr>
-
- <td>DE</td>
-
<td>chaos darmstadt</td>
<td>Up to date</td>
@@ -314,7 +246,7 @@
<td>Up to date</td>
<td> - </td>
- <td><a href="http://mirror.tor.hu/dist">http</a></td>
+ <td><a href="http://mirror.tor.hu/dist/">http</a></td>
<td><a href="http://mirror.tor.hu/">http</a></td>
<td> - </td>
<td> - </td>
@@ -348,8 +280,8 @@
<td>Up to date</td>
<td> - </td>
- <td><a href="http://torproject.nwlinux.us/dist">http</a></td>
- <td><a href="http://torproject.nwlinux.us">http</a></td>
+ <td><a href="http://torproject.nwlinux.us/dist/">http</a></td>
+ <td><a href="http://torproject.nwlinux.us/">http</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -358,6 +290,91 @@
<tr>
+ <td>IS</td>
+
+ <td>TheOnionRouter</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="http://www.theonionrouter.com/dist/">http</a></td>
+ <td><a href="http://www.theonionrouter.com/">http</a></td>
+ <td><a href="https://www.theonionrouter.com/dist/">https</a></td>
+ <td><a href="https://www.theonionrouter.com/">https</a></td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
+ <td>TN</td>
+
+ <td></td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="http://tor.mirror.tn/dist/">http</a></td>
+ <td><a href="http://tor.mirror.tn/">http</a></td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
+ <td>NL</td>
+
+ <td>Amorphis</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="http://tor.amorphis.eu/dist/">http</a></td>
+ <td><a href="http://tor.amorphis.eu/">http</a></td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
+ <td>IS</td>
+
+ <td>torproject.is</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="http://torproject.is/dist/">http</a></td>
+ <td><a href="http://torproject.is/">http</a></td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
+ <td>DE</td>
+
+ <td>factor.cc</td>
+
+ <td>Up to date</td>
+
+ <td> - </td>
+ <td><a href="http://tor.factor.cc/dist/">http</a></td>
+ <td><a href="http://tor.factor.cc/">http</a></td>
+ <td><a href="https://factor.cc/tor/dist/">https</a></td>
+ <td><a href="https://factor.cc/tor/">https</a></td>
+ <td> - </td>
+ <td> - </td>
+</tr>
+
+<tr>
+
<td>IL</td>
<td>Host4site</td>
@@ -365,7 +382,7 @@
<td>Up to date</td>
<td> - </td>
- <td><a href="http://mirror.host4site.co.il/torproject.org/dist">http</a></td>
+ <td><a href="http://mirror.host4site.co.il/torproject.org/dist/">http</a></td>
<td><a href="http://mirror.host4site.co.il/torproject.org/">http</a></td>
<td> - </td>
<td> - </td>
@@ -399,7 +416,7 @@
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.taiga-san.net/dist">http</a></td>
+ <td><a href="http://tor.taiga-san.net/dist/">http</a></td>
<td><a href="http://tor.taiga-san.net/">http</a></td>
<td> - </td>
<td> - </td>
@@ -416,7 +433,7 @@
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.homosu.net/dist">http</a></td>
+ <td><a href="http://tor.homosu.net/dist/">http</a></td>
<td><a href="http://tor.homosu.net/">http</a></td>
<td> - </td>
<td> - </td>
@@ -443,23 +460,6 @@
<tr>
- <td>INT</td>
-
- <td>CoralCDN</td>
-
- <td>Up to date</td>
-
- <td> - </td>
- <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td>
- <td><a href="http://www.torproject.org.nyud.net/">http</a></td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
- <td> - </td>
-</tr>
-
-<tr>
-
<td>DE</td>
<td></td>
@@ -467,8 +467,8 @@
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.freie-re.de/dist">http</a></td>
- <td><a href="http://tor.freie-re.de">http</a></td>
+ <td><a href="http://tor.freie-re.de/dist/">http</a></td>
+ <td><a href="http://tor.freie-re.de/">http</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -484,8 +484,8 @@
<td>Up to date</td>
<td> - </td>
- <td><a href="http://tor.vesta.nu/dist">http</a></td>
- <td><a href="http://tor.vesta.nu">http</a></td>
+ <td><a href="http://tor.vesta.nu/dist/">http</a></td>
+ <td><a href="http://tor.vesta.nu/">http</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -554,7 +554,7 @@
<td> - </td>
<td> - </td>
<td> - </td>
- <td><a href="https://www.coevoet.nl/tor/dist">https</a></td>
+ <td><a href="https://www.coevoet.nl/tor/dist/">https</a></td>
<td> - </td>
<td> - </td>
<td> - </td>
@@ -562,19 +562,19 @@
<tr>
- <td>IS</td>
+ <td>INT</td>
- <td>TheOnionRouter</td>
+ <td>CoralCDN</td>
<td>Unknown</td>
<td> - </td>
- <td><a href="http://www.theonionrouter.com/dist/">http</a></td>
- <td><a href="http://www.theonionrouter.com/">http</a></td>
- <td><a href="https://www.theonionrouter.com/dist/">https</a></td>
- <td><a href="https://www.theonionrouter.com/">https</a></td>
+ <td><a href="http://www.torproject.org.nyud.net/dist/">http</a></td>
+ <td><a href="http://www.torproject.org.nyud.net/">http</a></td>
<td> - </td>
<td> - </td>
+ <td> - </td>
+ <td> - </td>
</tr>
<tr>
@@ -586,10 +586,10 @@
<td>Unknown</td>
<td> - </td>
- <td><a href="https://torproject.crypto.is/dist">http</a></td>
- <td><a href="https://torproject.crypto.is">http</a></td>
- <td><a href="https://torproject.crypto.is/dist">https</a></td>
- <td><a href="https://torproject.crypto.is">https</a></td>
+ <td><a href="https://torproject.crypto.is/dist/">http</a></td>
+ <td><a href="https://torproject.crypto.is/">http</a></td>
+ <td><a href="https://torproject.crypto.is/dist/">https</a></td>
+ <td><a href="https://torproject.crypto.is/">https</a></td>
<td> - </td>
<td> - </td>
</tr>
Modified: website/trunk/update-mirrors.pl
===================================================================
--- website/trunk/update-mirrors.pl 2011-10-22 17:58:04 UTC (rev 25180)
+++ website/trunk/update-mirrors.pl 2011-10-22 20:58:30 UTC (rev 25181)
@@ -40,7 +40,7 @@
sub FetchDate {
my $url = shift; # Base url for mirror
- my $trace = "/project/trace/www-master.torproject.org"; # Location of recent update info
+ my $trace = "project/trace/www-master.torproject.org"; # this file should always exist
$url = "$url$trace";
print "Fetching possible date from: $url\n";
@@ -101,7 +101,6 @@
rsyncDistMirror => "",
hiddenServiceMirror => "",
updateDate => "Unknown",
-
},
mirror001 => {
@@ -262,7 +261,7 @@
httpsWebsiteMirror => "",
rsyncWebsiteMirror => "",
ftpWebsiteMirror => "",
- httpDistMirror => "http://mirror.tor.hu/dist",
+ httpDistMirror => "http://mirror.tor.hu/dist/",
httpsDistMirror => "",
rsyncDistMirror => "",
hiddenServiceMirror => "",
@@ -401,7 +400,7 @@
httpsWebsiteMirror => "",
rsyncWebsiteMirror => "",
ftpWebsiteMirror => "",
- httpDistMirror => "http://tor.homosu.net/dist",
+ httpDistMirror => "http://tor.homosu.net/dist/",
httpsDistMirror => "",
rsyncDistMirror => "",
hiddenServiceMirror => "",
@@ -435,11 +434,11 @@
ipv4 => "True",
ipv6 => "False",
loadBalanced => "No",
- httpWebsiteMirror => "http://torproject.nwlinux.us",
+ httpWebsiteMirror => "http://torproject.nwlinux.us/",
httpsWebsiteMirror => "",
rsyncWebsiteMirror => "rsync://nwlinux.us/tor-web",
ftpWebsiteMirror => "",
- httpDistMirror => "http://torproject.nwlinux.us/dist",
+ httpDistMirror => "http://torproject.nwlinux.us/dist/",
httpsDistMirror => "",
rsyncDistMirror => "rsync://nwlinux.us/tor-dist",
hiddenServiceMirror => "",
@@ -457,7 +456,7 @@
httpsWebsiteMirror => "",
rsyncWebsiteMirror => "",
ftpWebsiteMirror => "",
- httpDistMirror => "http://tor.taiga-san.net/dist",
+ httpDistMirror => "http://tor.taiga-san.net/dist/",
httpsDistMirror => "",
rsyncDistMirror => "",
hiddenServiceMirror => "",
@@ -471,11 +470,11 @@
ipv4 => "True",
ipv6 => "False",
loadBalanced => "No",
- httpWebsiteMirror => "http://tor.searchprivate.com",
+ httpWebsiteMirror => "http://tor.searchprivate.com/",
httpsWebsiteMirror => "",
rsyncWebsiteMirror => "",
ftpWebsiteMirror => "",
- httpDistMirror => "http://tor.searchprivate.com/dist",
+ httpDistMirror => "http://tor.searchprivate.com/dist/",
httpsDistMirror => "",
rsyncDistMirror => "",
hiddenServiceMirror => "",
@@ -489,11 +488,11 @@
ipv4 => "True",
ipv6 => "False",
loadBalanced => "No",
- httpWebsiteMirror => "http://tor.cyberarmy.at",
+ httpWebsiteMirror => "http://tor.cyberarmy.at/",
httpsWebsiteMirror => "",
rsyncWebsiteMirror => "",
ftpWebsiteMirror => "",
- httpDistMirror => "http://tor.cyberarmy.at/dist",
+ httpDistMirror => "http://tor.cyberarmy.at/dist/",
httpsDistMirror => "",
rsyncDistMirror => "",
hiddenServiceMirror => "",
@@ -511,7 +510,7 @@
httpsWebsiteMirror => "",
rsyncWebsiteMirror => "",
ftpWebsiteMirror => "",
- httpDistMirror => "http://torproject.is/dist",
+ httpDistMirror => "http://torproject.is/dist/",
httpsDistMirror => "",
rsyncDistMirror => "",
hiddenServiceMirror => "",
@@ -529,8 +528,8 @@
httpsWebsiteMirror => "https://www.torservers.net/mirrors/torproject.org/",
rsyncWebsiteMirror => "",
ftpWebsiteMirror => "",
- httpDistMirror => "http://www.torservers.net/mirrors/torproject.org/dist",
- httpsDistMirror => "https://www.torservers.net/mirrors/torproject.org/dist",
+ httpDistMirror => "http://www.torservers.net/mirrors/torproject.org/dist/",
+ httpsDistMirror => "https://www.torservers.net/mirrors/torproject.org/dist/",
rsyncDistMirror => "",
hiddenServiceMirror => "http://hbpvnydyyjbmhx6b.onion/mirrors/torproject.org/",
},
@@ -548,7 +547,7 @@
rsyncWebsiteMirror => "",
ftpWebsiteMirror => "",
httpDistMirror => "",
- httpsDistMirror => "https://www.coevoet.nl/tor/dist",
+ httpsDistMirror => "https://www.coevoet.nl/tor/dist/",
rsyncDistMirror => "",
hiddenServiceMirror => "",
},
@@ -561,12 +560,12 @@
ipv4 => "True",
ipv6 => "False",
loadBalanced => "No",
- httpWebsiteMirror => "https://torproject.crypto.is",
- httpsWebsiteMirror => "https://torproject.crypto.is",
+ httpWebsiteMirror => "https://torproject.crypto.is/",
+ httpsWebsiteMirror => "https://torproject.crypto.is/",
rsyncWebsiteMirror => "",
ftpWebsiteMirror => "",
- httpDistMirror => "https://torproject.crypto.is/dist",
- httpsDistMirror => "https://torproject.crypto.is/dist",
+ httpDistMirror => "https://torproject.crypto.is/dist/",
+ httpsDistMirror => "https://torproject.crypto.is/dist/",
rsyncDistMirror => "",
hiddenServiceMirror => "",
},
@@ -579,11 +578,11 @@
ipv4 => "True",
ipv6 => "False",
loadBalanced => "No",
- httpWebsiteMirror => "http://tor.vesta.nu",
+ httpWebsiteMirror => "http://tor.vesta.nu/",
httpsWebsiteMirror => "",
rsyncWebsiteMirror => "",
ftpWebsiteMirror => "",
- httpDistMirror => "http://tor.vesta.nu/dist",
+ httpDistMirror => "http://tor.vesta.nu/dist/",
httpsDistMirror => "",
rsyncDistMirror => "",
hiddenServiceMirror => "",
@@ -597,12 +596,12 @@
ipv4 => "True",
ipv6 => "False",
loadBalanced => "No",
- httpWebsiteMirror => "http://tor.key-server.org",
- httpsWebsiteMirror => "https://tor.key-server.org",
+ httpWebsiteMirror => "http://tor.key-server.org/",
+ httpsWebsiteMirror => "https://tor.key-server.org/",
rsyncWebsiteMirror => "",
ftpWebsiteMirror => "ftp://key-server.org/tor",
- httpDistMirror => "http://tor.key-server.org/dist",
- httpsDistMirror => "https://tor.key-server.org/dist",
+ httpDistMirror => "http://tor.key-server.org/dist/",
+ httpsDistMirror => "https://tor.key-server.org/dist/",
rsyncDistMirror => "",
hiddenServiceMirror => "",
},
@@ -615,11 +614,11 @@
ipv4 => "True",
ipv6 => "False",
loadBalanced => "No",
- httpWebsiteMirror => "http://tor.freie-re.de",
+ httpWebsiteMirror => "http://tor.freie-re.de/",
httpsWebsiteMirror => "",
rsyncWebsiteMirror => "",
ftpWebsiteMirror => "",
- httpDistMirror => "http://tor.freie-re.de/dist",
+ httpDistMirror => "http://tor.freie-re.de/dist/",
httpsDistMirror => "",
rsyncDistMirror => "",
hiddenServiceMirror => "",
@@ -637,7 +636,7 @@
httpsWebsiteMirror => "",
rsyncWebsiteMirror => "",
ftpWebsiteMirror => "",
- httpDistMirror => "http://mirror.host4site.co.il/torproject.org/dist",
+ httpDistMirror => "http://mirror.host4site.co.il/torproject.org/dist/",
httpsDistMirror => "",
rsyncDistMirror => "",
hiddenServiceMirror => "",
@@ -670,7 +669,7 @@
ipv6 => "False",
loadBalanced => "No",
httpWebsiteMirror => "http://tor.factor.cc/",
- httpsWebsiteMirror => "https://factor.cc/tor",
+ httpsWebsiteMirror => "https://factor.cc/tor/",
rsyncWebsiteMirror => "",
ftpWebsiteMirror => "",
httpDistMirror => "http://tor.factor.cc/dist/",
@@ -739,7 +738,7 @@
print "Fetching the last updated date for each mirror.\n";
my $tortime;
-$tortime = FetchDate("http://www.torproject.org/");
+$tortime = FetchDate("https://www.torproject.org/");
# Adjust offical 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";
More information about the tor-commits
mailing list