Update Mirror list

3 files changed, 280 insertions, 134 deletions

diff --git a/lib/cached.list.php b/lib/cached.list.php
index b79fcab63..865f90d5c 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -1,28 +1,66 @@
 <?php $mirrors = array (
+  '_C:AF' => 
+  array (
+    0 => 
+    array (
+      'zone' => 'ZA',
+      'country' => 'ZA',
+      'city' => 'Stellenbosch',
+      'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
+    ),
+    1 => 
+    array (
+      'zone' => 'ZA',
+      'country' => 'ZA',
+      'city' => 'Stellenbosch',
+      'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
+    ),
+    2 => 
+    array (
+      'zone' => 'ZA',
+      'country' => 'ZA',
+      'city' => 'Stellenbosch',
+      'url' => 'https://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
+    ),
+  ),
   '_C:AS' => 
   array (
     0 => 
     array (
+      'zone' => 'JP',
+      'country' => 'JP',
+      'city' => 'Tsukuba',
+      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
+    ),
+    1 => 
+    array (
+      'zone' => 'JP',
+      'country' => 'JP',
+      'city' => 'Tsukuba',
+      'url' => 'https://ftp.tsukuba.wide.ad.jp/Linux/mageia',
+    ),
+    2 => 
+    array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    1 => 
+    3 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    2 => 
+    4 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    3 => 
+    5 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -365,72 +403,114 @@
     array (
       'zone' => 'NL',
       'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+    48 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+    49 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    48 => 
+    50 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    49 => 
+    51 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    50 => 
+    52 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    51 => 
+    53 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    52 => 
+    54 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    53 => 
+    55 => 
+    array (
+      'zone' => 'RU',
+      'country' => 'RU',
+      'city' => 'Краснодар',
+      'url' => 'ftp://mirror.yandex.ru/mageia',
+    ),
+    56 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    54 => 
+    57 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    55 => 
+    58 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    56 => 
+    59 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://ftp.acc.umu.se/mirror/mageia',
     ),
+    60 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'ftp://mageia.ip-connect.info/mirror/mageia',
+    ),
+    61 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'http://mageia.ip-connect.info',
+    ),
+    62 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'https://mageia.ip-connect.info',
+    ),
   ),
   '_C:NA' => 
   array (
@@ -438,9 +518,30 @@
     array (
       'zone' => 'US',
       'country' => 'US',
+      'city' => '-',
+      'url' => 'http://mirrors.kernel.org/mageia',
+    ),
+    1 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => '-',
+      'url' => 'https://mirrors.kernel.org/mageia',
+    ),
+    2 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
       'city' => 'Princeton',
       'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
+    3 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Princeton',
+      'url' => 'https://mirror.math.princeton.edu/pub/mageia',
+    ),
   ),
   '_C:OC' => 
   array (
@@ -449,6 +550,13 @@
       'zone' => 'AU',
       'country' => 'AU',
       'city' => 'Brisbane',
+      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
+    ),
+    1 => 
+    array (
+      'zone' => 'AU',
+      'country' => 'AU',
+      'city' => 'Brisbane',
       'url' => 'https://mirror.aarnet.edu.au/pub/mageia',
     ),
   ),
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index f35fa63ba..865f90d5c 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -27,137 +27,46 @@
   array (
     0 => 
     array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Beijing',
-      'url' => 'http://mirrors.tuna.tsinghua.edu.cn/mageia',
-    ),
-    1 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Beijing',
-      'url' => 'https://mirrors.tuna.tsinghua.edu.cn/mageia',
-    ),
-    2 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'http://mirrors.ustc.edu.cn/mageia',
-    ),
-    3 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Hefei',
-      'url' => 'https://mirrors.ustc.edu.cn/mageia',
-    ),
-    4 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Nanjing',
-      'url' => 'http://mirrors.nju.edu.cn/mageia',
-    ),
-    5 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Nanjing',
-      'url' => 'https://mirrors.nju.edu.cn/mageia',
-    ),
-    6 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Shanghai',
-      'url' => 'http://ftp.sjtu.edu.cn/mageia',
-    ),
-    7 => 
-    array (
-      'zone' => 'CN',
-      'country' => 'CN',
-      'city' => 'Shanghai',
-      'url' => 'https://ftp.sjtu.edu.cn/mageia',
-    ),
-    8 => 
-    array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    9 => 
+    1 => 
     array (
       'zone' => 'JP',
       'country' => 'JP',
       'city' => 'Tsukuba',
       'url' => 'https://ftp.tsukuba.wide.ad.jp/Linux/mageia',
     ),
-    10 => 
-    array (
-      'zone' => 'PH',
-      'country' => 'PH',
-      'city' => 'Cebu',
-      'url' => 'ftp://mirror.rise.ph/mageia',
-    ),
-    11 => 
-    array (
-      'zone' => 'PH',
-      'country' => 'PH',
-      'city' => 'Cebu',
-      'url' => 'http://mirror.rise.ph/mageia',
-    ),
-    12 => 
+    2 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    13 => 
+    3 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    14 => 
+    4 => 
     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',
-    ),
-    16 => 
+    5 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    17 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'http://free.nchc.org.tw/mageia',
-    ),
-    18 => 
-    array (
-      'zone' => 'TW',
-      'country' => 'TW',
-      'city' => 'HsinChu',
-      'url' => 'https://free.nchc.org.tw/mageia',
-    ),
   ),
   '_C:EU' => 
   array (
@@ -502,57 +411,57 @@
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
-      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
-    ),
-    49 => 
-    array (
-      'zone' => 'NL',
-      'country' => 'NL',
-      'city' => 'Amsterdam',
       'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
-    50 => 
+    49 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    51 => 
+    50 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    52 => 
+    51 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    53 => 
+    52 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    54 => 
+    53 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    55 => 
+    54 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
+    55 => 
+    array (
+      'zone' => 'RU',
+      'country' => 'RU',
+      'city' => 'Краснодар',
+      'url' => 'ftp://mirror.yandex.ru/mageia',
+    ),
     56 => 
     array (
       'zone' => 'RU',
@@ -581,6 +490,27 @@
       'city' => 'Umeå',
       'url' => 'https://ftp.acc.umu.se/mirror/mageia',
     ),
+    60 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'ftp://mageia.ip-connect.info/mirror/mageia',
+    ),
+    61 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'http://mageia.ip-connect.info',
+    ),
+    62 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'https://mageia.ip-connect.info',
+    ),
   ),
   '_C:NA' => 
   array (
@@ -620,6 +550,13 @@
       'zone' => 'AU',
       'country' => 'AU',
       'city' => 'Brisbane',
+      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
+    ),
+    1 => 
+    array (
+      'zone' => 'AU',
+      'country' => 'AU',
+      'city' => 'Brisbane',
       'url' => 'https://mirror.aarnet.edu.au/pub/mageia',
     ),
   ),
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index b79fcab63..0e93da376 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -1,28 +1,66 @@
 <?php $mirrors = array (
+  '_C:AF' => 
+  array (
+    0 => 
+    array (
+      'zone' => 'ZA',
+      'country' => 'ZA',
+      'city' => 'Stellenbosch',
+      'url' => 'ftp://ftp.sun.ac.za/pub/mirrors/mageia',
+    ),
+    1 => 
+    array (
+      'zone' => 'ZA',
+      'country' => 'ZA',
+      'city' => 'Stellenbosch',
+      'url' => 'http://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
+    ),
+    2 => 
+    array (
+      'zone' => 'ZA',
+      'country' => 'ZA',
+      'city' => 'Stellenbosch',
+      'url' => 'https://ftp.sun.ac.za/ftp/pub/mirrors/mageia',
+    ),
+  ),
   '_C:AS' => 
   array (
     0 => 
     array (
+      'zone' => 'JP',
+      'country' => 'JP',
+      'city' => 'Tsukuba',
+      'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
+    ),
+    1 => 
+    array (
+      'zone' => 'JP',
+      'country' => 'JP',
+      'city' => 'Tsukuba',
+      'url' => 'https://ftp.tsukuba.wide.ad.jp/Linux/mageia',
+    ),
+    2 => 
+    array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'ftp://ftp.linux.org.tr/mageia',
     ),
-    1 => 
+    3 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'http://ftp.linux.org.tr/mageia',
     ),
-    2 => 
+    4 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    3 => 
+    5 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -365,72 +403,107 @@
     array (
       'zone' => 'NL',
       'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+    48 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+    49 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    48 => 
+    50 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    49 => 
+    51 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    50 => 
+    52 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    51 => 
+    53 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    52 => 
+    54 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Szczecin',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    53 => 
+    55 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
-      'url' => 'http://mirror.yandex.ru/mageia',
+      'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    54 => 
+    56 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    55 => 
+    57 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    56 => 
+    58 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://ftp.acc.umu.se/mirror/mageia',
     ),
+    59 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'ftp://mageia.ip-connect.info/mirror/mageia',
+    ),
+    60 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'http://mageia.ip-connect.info',
+    ),
+    61 => 
+    array (
+      'zone' => 'UA',
+      'country' => 'UA',
+      'city' => 'Vinnytsia',
+      'url' => 'https://mageia.ip-connect.info',
+    ),
   ),
   '_C:NA' => 
   array (
@@ -438,9 +511,30 @@
     array (
       'zone' => 'US',
       'country' => 'US',
+      'city' => '-',
+      'url' => 'http://mirrors.kernel.org/mageia',
+    ),
+    1 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => '-',
+      'url' => 'https://mirrors.kernel.org/mageia',
+    ),
+    2 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
       'city' => 'Princeton',
       'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
+    3 => 
+    array (
+      'zone' => 'US',
+      'country' => 'US',
+      'city' => 'Princeton',
+      'url' => 'https://mirror.math.princeton.edu/pub/mageia',
+    ),
   ),
   '_C:OC' => 
   array (
@@ -449,6 +543,13 @@
       'zone' => 'AU',
       'country' => 'AU',
       'city' => 'Brisbane',
+      'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
+    ),
+    1 => 
+    array (
+      'zone' => 'AU',
+      'country' => 'AU',
+      'city' => 'Brisbane',
       'url' => 'https://mirror.aarnet.edu.au/pub/mageia',
     ),
   ),