[tor-commits] r25111: {website} update factor.cc https mirror, factor location, and update a (in website/trunk: . include)

[Andrew Lewman]

Author: phobos
Date: 2011-09-23 19:48:03 +0000 (Fri, 23 Sep 2011)
New Revision: 25111

Modified:
   website/trunk/include/mirrors-table.wmi
   website/trunk/update-mirrors.pl
Log:
update factor.cc https mirror, factor location, and update all mirrors 


Modified: website/trunk/include/mirrors-table.wmi
===================================================================
--- website/trunk/include/mirrors-table.wmi	2011-09-22 15:24:59 UTC (rev 25110)
+++ website/trunk/include/mirrors-table.wmi	2011-09-23 19:48:03 UTC (rev 25111)
@@ -18,6 +18,23 @@
      
 <tr>
 
+         <td>DK</td>
+
+         <td>Zentrum der Gesundheit</td>
+
+         <td>Up to date</td>
+
+    <td> - </td>
+    <td><a href="http://tor.idnr.ws/dist/">http</a></td>
+    <td><a href="http://tor.idnr.ws/">http</a></td>
+    <td> - </td>
+    <td> - </td>
+    <td> - </td>
+    <td> - </td>
+</tr>
+     
+<tr>
+
          <td>EE</td>
 
          <td>CyberSIDE</td>
@@ -205,7 +222,7 @@
      
 <tr>
 
-         <td>AT</td>
+         <td>DE</td>
 
          <td>factor.cc</td>
 
@@ -214,8 +231,8 @@
     <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://tor.factor.cc/dist/">https</a></td>
-    <td><a href="https://tor.factor.cc/">https</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>
@@ -324,23 +341,6 @@
      
 <tr>
 
-         <td>US</td>
-
-         <td>AskApache</td>
-
-         <td>Up to date</td>
-
-    <td> - </td>
-    <td><a href="http://tor.askapache.com/dist/">http</a></td>
-    <td><a href="http://tor.askapache.com/">http</a></td>
-    <td> - </td>
-    <td> - </td>
-    <td> - </td>
-    <td> - </td>
-</tr>
-     
-<tr>
-
          <td>FR</td>
 
          <td>LazyTiger</td>
@@ -409,15 +409,15 @@
      
 <tr>
 
-         <td>SE</td>
+         <td>US</td>
 
-         <td>homosu</td>
+         <td>AskApache</td>
 
          <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/">http</a></td>
+    <td><a href="http://tor.askapache.com/dist/">http</a></td>
+    <td><a href="http://tor.askapache.com/">http</a></td>
     <td> - </td>
     <td> - </td>
     <td> - </td>
@@ -426,15 +426,15 @@
      
 <tr>
 
-         <td>DK</td>
+         <td>SE</td>
 
-         <td>Zentrum der Gesundheit</td>
+         <td>homosu</td>
 
          <td>Up to date</td>
 
     <td> - </td>
-    <td><a href="http://tor.idnr.ws/dist/">http</a></td>
-    <td><a href="http://tor.idnr.ws/">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>
     <td> - </td>

Modified: website/trunk/update-mirrors.pl
===================================================================
--- website/trunk/update-mirrors.pl	2011-09-22 15:24:59 UTC (rev 25110)
+++ website/trunk/update-mirrors.pl	2011-09-23 19:48:03 UTC (rev 25111)
@@ -700,18 +700,18 @@
         mirror043 => {
             adminContact => "",
             orgName => "factor.cc",
-            isoCC => "AT",
+            isoCC => "DE",
             subRegion => "",
-            region => "AT",
+            region => "DE",
             ipv4 => "True",
             ipv6 => "False",
             loadBalanced => "No",
             httpWebsiteMirror => "http://tor.factor.cc/",
-            httpsWebsiteMirror => "https://tor.factor.cc/",
+            httpsWebsiteMirror => "https://factor.cc/tor",
             rsyncWebsiteMirror => "",
             ftpWebsiteMirror => "",
             httpDistMirror => "http://tor.factor.cc/dist/",
-            httpsDistMirror => "https://tor.factor.cc/dist/",
+            httpsDistMirror => "https://factor.cc/tor/dist/",
             rsyncDistMirror => "",
             hiddenServiceMirror => "",
       }