From 9998c237c5a30f0ac0b6ddd9b13c166142642f0d Mon Sep 17 00:00:00 2001
From: Romain d'Alverny <rda@mageia.org>
Date: Wed, 4 May 2011 22:08:13 +0000
Subject: remove https mirror links CCBUG 1140

---
 lib/Downloads.php   |   2 +-
 lib/cached.list.php | 119 ++++++++++++++++++++++++++++------------------------
 2 files changed, 65 insertions(+), 56 deletions(-)

(limited to 'lib')

diff --git a/lib/Downloads.php b/lib/Downloads.php
index 614ad09d1..d9a625c41 100644
--- a/lib/Downloads.php
+++ b/lib/Downloads.php
@@ -110,7 +110,7 @@ class Downloads
                 $m[$val[0]] = $val[1];
             }
             $pu = parse_url($m['url']);
-            if (in_array($pu['scheme'], array('http', 'https', 'ftp')))
+            if (in_array($pu['scheme'], array('http', 'ftp')))
                 $mirrors3[$m['country']][] = array(
                     'city' => $m['city'],
                     'zone' => $m['zone'],
diff --git a/lib/cached.list.php b/lib/cached.list.php
index 7982c2609..a3b888d72 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -1,56 +1,65 @@
 <?php $mirrors = array (
+  'NL' => 
+  array (
+    0 => 
+    array (
+      'city' => 'Amsterdam',
+      'zone' => 'NL',
+      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Amsterdam',
+      'zone' => 'NL',
+      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+  ),
   'DE' => 
   array (
     0 => 
     array (
-      'city' => 'Erfurt',
+      'city' => 'Erlangen',
       'zone' => 'DE',
-      'url' => 'ftp://ftp.mandrivauser.de/mirrors/Mageia',
+      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
     1 => 
     array (
-      'city' => 'Erfurt',
+      'city' => 'Erlangen',
       'zone' => 'DE',
-      'url' => 'http://ftp.mandrivauser.de/mirrors/Mageia',
+      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
     ),
     2 => 
     array (
       'city' => 'Esslingen',
       'zone' => 'DE',
-      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
     3 => 
     array (
-      'city' => 'Erlangen',
+      'city' => 'Erfurt',
       'zone' => 'DE',
-      'url' => 'http://ftp.uni-erlangen.de/mirrors/Mageia',
+      'url' => 'ftp://ftp.mandrivauser.de/mirrors/Mageia',
     ),
     4 => 
     array (
-      'city' => 'Esslingen',
+      'city' => 'Erfurt',
       'zone' => 'DE',
-      'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
+      'url' => 'http://ftp.mandrivauser.de/mirrors/Mageia',
     ),
     5 => 
     array (
-      'city' => 'Erlangen',
+      'city' => 'Esslingen',
       'zone' => 'DE',
-      'url' => 'ftp://ftp.uni-erlangen.de/mirrors/Mageia',
+      'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
     ),
   ),
-  'NL' => 
+  'CN' => 
   array (
     0 => 
     array (
-      'city' => 'Amsterdam',
-      'zone' => 'NL',
-      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    1 => 
-    array (
-      'city' => 'Amsterdam',
-      'zone' => 'NL',
-      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+      'city' => 'Beijing',
+      'zone' => 'CN',
+      'url' => 'http://fundawang.lcuc.org.cn/mageia',
     ),
   ),
   'CH' => 
@@ -68,79 +77,79 @@
       'url' => 'http://mageia.unige.ch/mirror',
     ),
   ),
-  'FR' => 
+  'NC' => 
   array (
     0 => 
     array (
-      'city' => 'Paris',
-      'zone' => 'FR',
-      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'city' => 'Nouméa',
+      'zone' => 'NC',
+      'url' => 'http://mageia.nautile.nc/mageia',
     ),
-    1 => 
+  ),
+  'FR' => 
+  array (
+    0 => 
     array (
       'city' => 'Paris',
       'zone' => 'FR',
-      'url' => 'https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    2 => 
+    1 => 
     array (
       'city' => 'Paris',
       'zone' => 'FR',
-      'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+      'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
   ),
-  'US' => 
+  'GR' => 
   array (
     0 => 
     array (
-      'city' => 'Durham',
-      'zone' => 'US',
-      'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
+      'city' => 'Heraklion',
+      'zone' => 'GR',
+      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
+    ),
+    1 => 
+    array (
+      'city' => 'Heraklion',
+      'zone' => 'GR',
+      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
     ),
   ),
   'CZ' => 
   array (
     0 => 
     array (
-      'city' => 'Durham',
+      'city' => 'Heraklion',
       'zone' => 'CZ',
-      'url' => 'ftp://ftp.sh.cvut.cz/MIRRORS/mageia',
+      'url' => 'http://ftp.sh.cvut.cz/MIRRORS/mageia',
     ),
     1 => 
     array (
-      'city' => 'Durham',
+      'city' => 'Paris',
       'zone' => 'CZ',
-      'url' => 'http://mageia.supp.name',
+      'url' => 'ftp://ftp.sh.cvut.cz/MIRRORS/mageia',
     ),
     2 => 
     array (
-      'city' => 'Erlangen',
+      'city' => 'Paris',
       'zone' => 'CZ',
-      'url' => 'http://ftp.sh.cvut.cz/MIRRORS/mageia',
+      'url' => 'http://mageia.supp.name',
     ),
   ),
-  'GR' => 
+  'US' => 
   array (
     0 => 
     array (
-      'city' => 'Heraklion',
-      'zone' => 'GR',
-      'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
+      'city' => 'Durham',
+      'zone' => 'US',
+      'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
     ),
     1 => 
     array (
-      'city' => 'Heraklion',
-      'zone' => 'GR',
-      'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
-    ),
-  ),
-  'NC' => 
-  array (
-    0 => 
-    array (
-      'city' => 'Nouméa',
-      'zone' => 'NC',
-      'url' => 'http://mageia.nautile.nc/mageia',
+      'city' => 'Durham',
+      'zone' => 'US',
+      'url' => 'ftp://distro.ibiblio.org/pub/linux/distributions/mageia',
     ),
   ),
 ); ?>
\ No newline at end of file
-- 
cgit v1.2.1