refresh mirrors lists

3 files changed, 166 insertions, 348 deletions

diff --git a/lib/cached.list.php b/lib/cached.list.php
index 3c3b9f29b..e19d4b9dd 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -97,54 +97,47 @@
     ),
     10 => 
     array (
-      'zone' => 'PH',
-      'country' => 'PH',
-      'city' => 'Cebu',
-      'url' => 'ftp://mirror.rise.ph/mageia',
+      'zone' => 'TR',
+      'country' => 'TR',
+      'city' => 'Ankara',
+      'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
     11 => 
     array (
-      'zone' => 'PH',
-      'country' => 'PH',
-      'city' => 'Cebu',
-      'url' => 'http://mirror.rise.ph/mageia',
-    ),
-    12 => 
-    array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    13 => 
+    12 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    14 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    15 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    16 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    17 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -324,278 +317,236 @@
     ),
     24 => 
     array (
-      'zone' => 'DK',
-      'country' => 'DK',
-      'city' => 'DTU, Lyngby',
-      'url' => 'http://ftp.klid.dk/ftp/mageia',
-    ),
-    25 => 
-    array (
-      'zone' => 'FR',
-      'country' => 'FR',
-      'city' => 'Lyon',
-      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
-    ),
-    26 => 
-    array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    27 => 
+    25 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'https://fr2.rpmfind.net/linux/mageia',
     ),
-    28 => 
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    29 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    30 => 
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    31 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    32 => 
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    33 => 
+    31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    34 => 
+    32 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    35 => 
+    33 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    36 => 
+    34 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'https://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    37 => 
+    35 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => '-',
       'url' => 'http://ftp.cc.uoc.gr/pub/linux/mageia',
     ),
-    38 => 
+    36 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'http://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    39 => 
+    37 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'https://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    40 => 
+    38 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => '-',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    41 => 
+    39 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => '-',
       'url' => 'https://mageia.mirror.garr.it/mageia',
     ),
-    42 => 
+    40 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    43 => 
+    41 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    44 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    45 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    46 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
-      'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    47 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Den Haag',
-      'url' => 'http://mirror.serverion.com/mageia',
-    ),
-    48 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Den Haag',
-      'url' => 'https://mirror.serverion.com/mageia',
-    ),
-    49 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    50 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    51 => 
+    44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    52 => 
+    45 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    53 => 
+    46 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    54 => 
+    47 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    55 => 
+    48 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    56 => 
+    49 => 
+    array (
+      'zone' => 'RU',
+      'country' => 'RU',
+      'city' => 'Краснодар',
+      'url' => 'https://mirror.yandex.ru/mageia',
+    ),
+    50 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    57 => 
+    51 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://ftp.acc.umu.se/mirror/mageia',
     ),
-    58 => 
+    52 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.info/mirror/mageia',
     ),
-    59 => 
+    53 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    60 => 
+    54 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.info',
     ),
-    61 => 
+    55 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.vn.ua',
     ),
-    62 => 
+    56 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'https://mageia.ip-connect.info',
     ),
-    63 => 
+    57 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -623,58 +574,16 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Durham',
-      'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia',
-    ),
-    3 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Durham',
-      'url' => 'https://distro.ibiblio.org/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
       'city' => 'Princeton',
       'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
-    5 => 
+    3 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
       'url' => 'https://mirror.math.princeton.edu/pub/mageia',
     ),
-    6 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'ftp://mageia.jameswhitby.net/mageia',
-    ),
-    7 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'http://mageia.jameswhitby.net',
-    ),
-    8 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'https://mageia.jameswhitby.net',
-    ),
-    9 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'richmond',
-      'url' => 'http://jameswhitby.net/mageia',
-    ),
   ),
   '_C:OC' => 
   array (
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index d831088a5..8367d0d74 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -114,37 +114,44 @@
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
-      'url' => 'http://ftp.linux.org.tr/mageia',
+      'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
     13 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
-      'url' => 'https://ftp.linux.org.tr/mageia',
+      'url' => 'http://ftp.linux.org.tr/mageia',
     ),
     14 => 
     array (
+      'zone' => 'TR',
+      'country' => 'TR',
+      'city' => 'Ankara',
+      'url' => 'https://ftp.linux.org.tr/mageia',
+    ),
+    15 => 
+    array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    15 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    16 => 
+    17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    17 => 
+    18 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -324,278 +331,257 @@
     ),
     24 => 
     array (
-      'zone' => 'DK',
-      'country' => 'DK',
-      'city' => 'DTU, Lyngby',
-      'url' => 'http://ftp.klid.dk/ftp/mageia',
-    ),
-    25 => 
-    array (
-      'zone' => 'FR',
-      'country' => 'FR',
-      'city' => 'Lyon',
-      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
-    ),
-    26 => 
-    array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    27 => 
+    25 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'https://fr2.rpmfind.net/linux/mageia',
     ),
-    28 => 
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    29 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    30 => 
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    31 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    32 => 
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    33 => 
+    31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    34 => 
+    32 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    35 => 
+    33 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    36 => 
+    34 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'https://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    37 => 
+    35 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => '-',
       'url' => 'http://ftp.cc.uoc.gr/pub/linux/mageia',
     ),
-    38 => 
+    36 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'http://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    39 => 
+    37 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'https://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    40 => 
+    38 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => '-',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    41 => 
+    39 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => '-',
       'url' => 'https://mageia.mirror.garr.it/mageia',
     ),
-    42 => 
+    40 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    43 => 
+    41 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    44 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    45 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    46 => 
+    44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    47 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Den Haag',
-      'url' => 'http://mirror.serverion.com/mageia',
-    ),
-    48 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Den Haag',
-      'url' => 'https://mirror.serverion.com/mageia',
-    ),
-    49 => 
+    45 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    50 => 
+    46 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    51 => 
+    47 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    52 => 
+    48 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    53 => 
+    49 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    54 => 
+    50 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    55 => 
+    51 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    56 => 
+    52 => 
+    array (
+      'zone' => 'RU',
+      'country' => 'RU',
+      'city' => 'Краснодар',
+      'url' => 'https://mirror.yandex.ru/mageia',
+    ),
+    53 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    57 => 
+    54 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://ftp.acc.umu.se/mirror/mageia',
     ),
-    58 => 
+    55 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.info/mirror/mageia',
     ),
-    59 => 
+    56 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    60 => 
+    57 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.info',
     ),
-    61 => 
+    58 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.vn.ua',
     ),
-    62 => 
+    59 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'https://mageia.ip-connect.info',
     ),
-    63 => 
+    60 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -633,34 +619,6 @@
       'city' => 'Princeton',
       'url' => 'https://mirror.math.princeton.edu/pub/mageia',
     ),
-    4 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'ftp://mageia.jameswhitby.net/mageia',
-    ),
-    5 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'http://mageia.jameswhitby.net',
-    ),
-    6 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'https://mageia.jameswhitby.net',
-    ),
-    7 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'richmond',
-      'url' => 'http://jameswhitby.net/mageia',
-    ),
   ),
   '_C:OC' => 
   array (
@@ -668,17 +626,10 @@
     array (
       'zone' => 'AU',
       'country' => 'AU',
-      'city' => 'Adelaide',
-      'url' => 'http://mirror.internode.on.net/pub/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'AU',
-      'country' => 'AU',
       'city' => 'Brisbane',
       'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
     ),
-    2 => 
+    1 => 
     array (
       'zone' => 'AU',
       'country' => 'AU',
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index 742b73b88..857e22f58 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -114,37 +114,51 @@
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
-      'url' => 'http://ftp.linux.org.tr/mageia',
+      'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
     13 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
-      'url' => 'https://ftp.linux.org.tr/mageia',
+      'url' => 'http://ftp.linux.org.tr/mageia',
     ),
     14 => 
     array (
+      'zone' => 'TR',
+      'country' => 'TR',
+      'city' => 'Ankara',
+      'url' => 'https://ftp.linux.org.tr/mageia',
+    ),
+    15 => 
+    array (
+      'zone' => 'TR',
+      'country' => 'TR',
+      'city' => 'istanbul',
+      'url' => 'https://mirror.rabisu.com/mageia',
+    ),
+    16 => 
+    array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    15 => 
+    17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    16 => 
+    18 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    17 => 
+    19 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -324,278 +338,257 @@
     ),
     24 => 
     array (
-      'zone' => 'DK',
-      'country' => 'DK',
-      'city' => 'DTU, Lyngby',
-      'url' => 'http://ftp.klid.dk/ftp/mageia',
-    ),
-    25 => 
-    array (
-      'zone' => 'FR',
-      'country' => 'FR',
-      'city' => 'Lyon',
-      'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
-    ),
-    26 => 
-    array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'http://fr2.rpmfind.net/linux/mageia',
     ),
-    27 => 
+    25 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Lyon',
       'url' => 'https://fr2.rpmfind.net/linux/mageia',
     ),
-    28 => 
+    26 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    29 => 
+    27 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
     ),
-    30 => 
+    28 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://aglae.biomedicale.univ-paris5.fr',
     ),
-    31 => 
+    29 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    32 => 
+    30 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'http://ftp.free.fr/mirrors/mageia.org',
     ),
-    33 => 
+    31 => 
     array (
       'zone' => 'FR',
       'country' => 'FR',
       'city' => 'Paris',
       'url' => 'https://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
     ),
-    34 => 
+    32 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    35 => 
+    33 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    36 => 
+    34 => 
     array (
       'zone' => 'GB',
       'country' => 'GB',
       'city' => 'Canterbury',
       'url' => 'https://www.mirrorservice.org/sites/mageia.org/pub/mageia',
     ),
-    37 => 
+    35 => 
     array (
       'zone' => 'GR',
       'country' => 'GR',
       'city' => '-',
       'url' => 'http://ftp.cc.uoc.gr/pub/linux/mageia',
     ),
-    38 => 
+    36 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'http://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    39 => 
+    37 => 
     array (
       'zone' => 'HU',
       'country' => 'HU',
       'city' => 'Miskolc',
       'url' => 'https://quantum-mirror.hu/mirrors/pub/mageia',
     ),
-    40 => 
+    38 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => '-',
       'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
     ),
-    41 => 
+    39 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => '-',
       'url' => 'https://mageia.mirror.garr.it/mageia',
     ),
-    42 => 
+    40 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'ftp://vodka.sublink.org/mageia',
     ),
-    43 => 
+    41 => 
     array (
       'zone' => 'IT',
       'country' => 'IT',
       'city' => 'Milan',
       'url' => 'http://vodka.sublink.org/mageia',
     ),
-    44 => 
+    42 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    45 => 
+    43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    46 => 
+    44 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
       'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    47 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Den Haag',
-      'url' => 'http://mirror.serverion.com/mageia',
-    ),
-    48 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Den Haag',
-      'url' => 'https://mirror.serverion.com/mageia',
-    ),
-    49 => 
+    45 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    50 => 
+    46 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    51 => 
+    47 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    52 => 
+    48 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    53 => 
+    49 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    54 => 
+    50 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    55 => 
+    51 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    56 => 
+    52 => 
+    array (
+      'zone' => 'RU',
+      'country' => 'RU',
+      'city' => 'Краснодар',
+      'url' => 'https://mirror.yandex.ru/mageia',
+    ),
+    53 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    57 => 
+    54 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://ftp.acc.umu.se/mirror/mageia',
     ),
-    58 => 
+    55 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.info/mirror/mageia',
     ),
-    59 => 
+    56 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    60 => 
+    57 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.info',
     ),
-    61 => 
+    58 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.vn.ua',
     ),
-    62 => 
+    59 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'https://mageia.ip-connect.info',
     ),
-    63 => 
+    60 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -647,34 +640,6 @@
       'city' => 'Princeton',
       'url' => 'https://mirror.math.princeton.edu/pub/mageia',
     ),
-    6 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'ftp://mageia.jameswhitby.net/mageia',
-    ),
-    7 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'http://mageia.jameswhitby.net',
-    ),
-    8 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'Richmond, VA',
-      'url' => 'https://mageia.jameswhitby.net',
-    ),
-    9 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
-      'city' => 'richmond',
-      'url' => 'http://jameswhitby.net/mageia',
-    ),
   ),
   '_C:OC' => 
   array (
@@ -682,17 +647,10 @@
     array (
       'zone' => 'AU',
       'country' => 'AU',
-      'city' => 'Adelaide',
-      'url' => 'http://mirror.internode.on.net/pub/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'AU',
-      'country' => 'AU',
       'city' => 'Brisbane',
       'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
     ),
-    2 => 
+    1 => 
     array (
       'zone' => 'AU',
       'country' => 'AU',