[tor-commits] r26249: {website} update mirrors table, and fix the admin contact for mirror 0 (in website/trunk: . include)

[Andrew Lewman]

Author: phobos
Date: 2013-07-09 12:28:00 +0000 (Tue, 09 Jul 2013)
New Revision: 26249

Modified:
   website/trunk/include/mirrors-table.wmi
   website/trunk/update-mirrors.pl
Log:
update mirrors table, and fix the admin contact for mirror 095


Modified: website/trunk/include/mirrors-table.wmi
===================================================================
--- website/trunk/include/mirrors-table.wmi	2013-07-09 12:21:17 UTC (rev 26248)
+++ website/trunk/include/mirrors-table.wmi	2013-07-09 12:28:00 UTC (rev 26249)
@@ -18,40 +18,6 @@
      
 <tr>
 
-         <td>NL</td>
-
-         <td>CCC</td>
-
-         <td>Up to date</td>
-
-    <td> - </td>
-    <td><a href="http://tor.ccc.de/dist/">http</a></td>
-    <td><a href="http://tor.ccc.de/">http</a></td>
-    <td> - </td>
-    <td> - </td>
-    <td> - </td>
-    <td> - </td>
-</tr>
-     
-<tr>
-
-         <td>EE</td>
-
-         <td>CyberSIDE</td>
-
-         <td>Up to date</td>
-
-    <td> - </td>
-    <td><a href="http://cyberside.net.ee/tor/">http</a></td>
-    <td><a href="http://cyberside.planet.ee/tor/">http</a></td>
-    <td> - </td>
-    <td> - </td>
-    <td> - </td>
-    <td> - </td>
-</tr>
-     
-<tr>
-
          <td>IS</td>
 
          <td>torproject.is</td>
@@ -222,6 +188,23 @@
      
 <tr>
 
+         <td>FR</td>
+
+         <td>linsrv</td>
+
+         <td>Up to date</td>
+
+    <td><a href="ftp://ftp.linsrv.net/pub/torproject/">ftp</a></td>
+    <td><a href="http://mirrors.linsrv.net/torproject/dist/">http</a></td>
+    <td><a href="http://mirrors.linsrv.net/torproject/">http</a></td>
+    <td> - </td>
+    <td> - </td>
+    <td><a href="mirrors.linsrv.net::pub/torproject/dist">rsync</a></td>
+    <td><a href="mirrors.linsrv.net::pub/torproject">rsync</a></td>
+</tr>
+     
+<tr>
+
          <td>UK</td>
 
          <td></td>
@@ -647,23 +630,6 @@
      
 <tr>
 
-         <td>AT</td>
-
-         <td>TechAsk.IT</td>
-
-         <td>Up to date</td>
-
-    <td> - </td>
-    <td><a href="http://www.unicorncloud.org/public/torproject.org/dist">http</a></td>
-    <td><a href="http://www.unicorncloud.org/public/torproject.org/">http</a></td>
-    <td><a href="https://www.unicorncloud.org/public/torproject.org/dist">https</a></td>
-    <td><a href="https://www.unicorncloud.org/public/torproject.org/">https</a></td>
-    <td> - </td>
-    <td> - </td>
-</tr>
-     
-<tr>
-
          <td>LT</td>
 
          <td></td>
@@ -715,6 +681,23 @@
      
 <tr>
 
+         <td>EE</td>
+
+         <td>CyberSIDE</td>
+
+         <td>Up to date</td>
+
+    <td> - </td>
+    <td><a href="http://cyberside.net.ee/tor/">http</a></td>
+    <td><a href="http://cyberside.planet.ee/tor/">http</a></td>
+    <td> - </td>
+    <td> - </td>
+    <td> - </td>
+    <td> - </td>
+</tr>
+     
+<tr>
+
          <td>SE</td>
 
          <td>homosu</td>
@@ -834,6 +817,23 @@
      
 <tr>
 
+         <td>NL</td>
+
+         <td>CCC</td>
+
+         <td>Unknown</td>
+
+    <td> - </td>
+    <td><a href="http://tor.ccc.de/dist/">http</a></td>
+    <td><a href="http://tor.ccc.de/">http</a></td>
+    <td> - </td>
+    <td> - </td>
+    <td> - </td>
+    <td> - </td>
+</tr>
+     
+<tr>
+
          <td>US</td>
 
          <td></td>
@@ -1001,3 +1001,20 @@
     <td> - </td>
     <td> - </td>
 </tr>
+     
+<tr>
+
+         <td>AT</td>
+
+         <td>TechAsk.IT</td>
+
+         <td>Unknown</td>
+
+    <td> - </td>
+    <td><a href="http://www.unicorncloud.org/public/torproject.org/dist">http</a></td>
+    <td><a href="http://www.unicorncloud.org/public/torproject.org/">http</a></td>
+    <td><a href="https://www.unicorncloud.org/public/torproject.org/dist">https</a></td>
+    <td><a href="https://www.unicorncloud.org/public/torproject.org/">https</a></td>
+    <td> - </td>
+    <td> - </td>
+</tr>

Modified: website/trunk/update-mirrors.pl
===================================================================
--- website/trunk/update-mirrors.pl	2013-07-09 12:21:17 UTC (rev 26248)
+++ website/trunk/update-mirrors.pl	2013-07-09 12:28:00 UTC (rev 26249)
@@ -1165,7 +1165,7 @@
 	hiddenServiceMirror => ""
     },
       mirror095 => {
-	adminContact => "mirror-admin at linsrv.net",
+	adminContact => "mirror-admin\@linsrv.net",
 	orgName => "linsrv",
 	isoCC => "FR",
 	subRegion => "France",