1 files changed, 84 insertions, 35 deletions

diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index 386f9ac4a..742b73b88 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -114,44 +114,37 @@
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
-      'url' => 'ftp://ftp.linux.org.tr/mageia',
-    ),
-    13 => 
-    array (
-      'zone' => 'TR',
-      'country' => 'TR',
-      'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    14 => 
+    13 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    15 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    16 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    17 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    18 => 
+    17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -494,86 +487,121 @@
     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 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Enschede',
+      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
+    ),
+    50 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    48 => 
+    51 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    49 => 
+    52 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    50 => 
+    53 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    51 => 
+    54 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    52 => 
+    55 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    53 => 
-    array (
-      'zone' => 'RU',
-      'country' => 'RU',
-      'city' => 'Краснодар',
-      'url' => 'https://mirror.yandex.ru/mageia',
-    ),
-    54 => 
+    56 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    55 => 
+    57 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://ftp.acc.umu.se/mirror/mageia',
     ),
-    56 => 
+    58 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.info/mirror/mageia',
     ),
-    57 => 
+    59 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
+    ),
+    60 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.info',
     ),
-    58 => 
+    61 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'http://mageia.ip-connect.vn.ua',
+    ),
+    62 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'https://mageia.ip-connect.info',
     ),
+    63 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'https://mageia.ip-connect.vn.ua',
+    ),
   ),
   '_C:NA' => 
   array (
@@ -640,6 +668,13 @@
       'city' => 'Richmond, VA',
       'url' => 'https://mageia.jameswhitby.net',
     ),
+    9 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'richmond',
+      'url' => 'http://jameswhitby.net/mageia',
+    ),
   ),
   '_C:OC' => 
   array (
@@ -669,47 +704,61 @@
   array (
     0 => 
     array (
+      'zone' => 'AR',
+      'country' => 'AR',
+      'city' => 'Buenos Aires',
+      'url' => 'http://mageia.zero.com.ar',
+    ),
+    1 => 
+    array (
+      'zone' => 'AR',
+      'country' => 'AR',
+      'city' => 'Buenos Aires',
+      'url' => 'https://mageia.zero.com.ar',
+    ),
+    2 => 
+    array (
       'zone' => 'BR',
       'country' => 'BR',
       'city' => '-',
       'url' => 'http://mageia.c3sl.ufpr.br',
     ),
-    1 => 
+    3 => 
     array (
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
       'url' => 'ftp://mageia.fis.unb.br/pub/linux/mageia',
     ),
-    2 => 
+    4 => 
     array (
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
       'url' => 'http://mageia.fis.unb.br',
     ),
-    3 => 
+    5 => 
     array (
       'zone' => 'BR',
       'country' => 'BR',
       'city' => 'Brasilia',
       'url' => 'https://mageia.fis.unb.br',
     ),
-    4 => 
+    6 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'ftp://mirror.cedia.org.ec/mageia',
     ),
-    5 => 
+    7 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',
       'city' => 'Cuenca',
       'url' => 'http://mirror.cedia.org.ec/mageia',
     ),
-    6 => 
+    8 => 
     array (
       'zone' => 'EC',
       'country' => 'EC',