Update mirrors cache

3 files changed, 219 insertions, 149 deletions

diff --git a/lib/cached.list.php b/lib/cached.list.php
index a2d64bdc6..7862ef9d4 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -90,82 +90,61 @@
     ),
     9 => 
     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 => 
+    10 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    12 => 
-    array (
-      '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 => 
+    11 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    15 => 
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    16 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    17 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    18 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'https://free.nchc.org.tw/mageia',
     ),
-    19 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    20 => 
+    17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -474,72 +453,114 @@
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
-      'url' => 'http://mageia.mirror.triple-it.nl',
+      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
     43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+    44 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'http://mageia.mirror.triple-it.nl',
+    ),
+    45 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+    46 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Den Haag',
+      'url' => 'http://mirror.serverion.com/mageia',
+    ),
+    47 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Den Haag',
+      'url' => 'https://mirror.serverion.com/mageia',
+    ),
+    48 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Enschede',
+      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
+    ),
+    49 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    44 => 
+    50 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    45 => 
+    51 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    46 => 
+    52 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    47 => 
+    53 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    48 => 
+    54 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    49 => 
+    55 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    50 => 
+    56 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    51 => 
+    57 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    52 => 
+    58 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
@@ -581,52 +602,45 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Durham',
-      'url' => 'https://distro.ibiblio.org/mageia',
-    ),
-    5 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
       'city' => 'Lenoir, NC',
       'url' => 'http://mirror.dacentec.com/mageia',
     ),
-    6 => 
+    5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Lenoir, NC',
       'url' => 'https://mirror.dacentec.com/mageia',
     ),
-    7 => 
+    6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
       'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
-    8 => 
+    7 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
       'url' => 'https://mirror.math.princeton.edu/pub/mageia',
     ),
-    9 => 
+    8 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Richmond, VA',
       'url' => 'ftp://mageia.jameswhitby.net/mageia',
     ),
-    10 => 
+    9 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Richmond, VA',
       'url' => 'http://mageia.jameswhitby.net',
     ),
-    11 => 
+    10 => 
     array (
       'zone' => 'US',
       'country' => 'US',
@@ -643,6 +657,13 @@
       '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',
+    ),
   ),
   '_C:SA' => 
   array (
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index fe38de1ec..ed05ab279 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -76,82 +76,61 @@
     ),
     7 => 
     array (
-      'zone' => 'JP',
-      'country' => 'JP',
-      'city' => 'Tsukuba',
-      'url' => 'https://ftp.tsukuba.wide.ad.jp/Linux/mageia',
-    ),
-    8 => 
-    array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'ftp://mirror.rise.ph/mageia',
     ),
-    9 => 
+    8 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    10 => 
-    array (
-      'zone' => 'TR',
-      'country' => 'TR',
-      'city' => 'Ankara',
-      'url' => 'ftp://ftp.linux.org.tr/mageia',
-    ),
-    11 => 
-    array (
-      'zone' => 'TR',
-      'country' => 'TR',
-      'city' => 'Ankara',
-      'url' => 'http://ftp.linux.org.tr/mageia',
-    ),
-    12 => 
+    9 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    13 => 
+    10 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    14 => 
+    11 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    15 => 
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    16 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'https://free.nchc.org.tw/mageia',
     ),
-    17 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    18 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -460,93 +439,135 @@
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
-      'url' => 'http://mageia.mirror.triple-it.nl',
+      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
     43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+    44 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'http://mageia.mirror.triple-it.nl',
+    ),
+    45 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+    46 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Den Haag',
+      'url' => 'http://mirror.serverion.com/mageia',
+    ),
+    47 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Den Haag',
+      'url' => 'https://mirror.serverion.com/mageia',
+    ),
+    48 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Enschede',
+      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
+    ),
+    49 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    44 => 
+    50 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    45 => 
+    51 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    46 => 
+    52 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    47 => 
+    53 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    48 => 
+    54 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    49 => 
+    55 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    50 => 
+    56 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    51 => 
+    57 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    52 => 
+    58 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://ftp.acc.umu.se/mirror/mageia',
     ),
-    53 => 
+    59 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    54 => 
+    60 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.vn.ua',
     ),
-    55 => 
+    61 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -643,6 +664,13 @@
       'city' => 'Brisbane',
       'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
     ),
+    2 => 
+    array (
+      'zone' => 'AU',
+      'country' => 'AU',
+      'city' => 'Brisbane',
+      'url' => 'https://mirror.aarnet.edu.au/pub/mageia',
+    ),
   ),
   '_C:SA' => 
   array (
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index 6fa9fbf8e..102d52be0 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -90,82 +90,61 @@
     ),
     9 => 
     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 => 
+    10 => 
     array (
       'zone' => 'PH',
       'country' => 'PH',
       'city' => 'Cebu',
       'url' => 'http://mirror.rise.ph/mageia',
     ),
-    12 => 
-    array (
-      '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 => 
+    11 => 
     array (
       'zone' => 'TR',
       'country' => 'TR',
       'city' => 'Ankara',
       'url' => 'https://ftp.linux.org.tr/mageia',
     ),
-    15 => 
+    12 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://free.nchc.org.tw/mageia',
     ),
-    16 => 
+    13 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
     ),
-    17 => 
+    14 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'http://free.nchc.org.tw/mageia',
     ),
-    18 => 
+    15 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'HsinChu',
       'url' => 'https://free.nchc.org.tw/mageia',
     ),
-    19 => 
+    16 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
       'city' => 'Taipei',
       'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
     ),
-    20 => 
+    17 => 
     array (
       'zone' => 'TW',
       'country' => 'TW',
@@ -474,93 +453,135 @@
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Amsterdam',
-      'url' => 'http://mageia.mirror.triple-it.nl',
+      'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
     ),
     43 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+    44 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'http://mageia.mirror.triple-it.nl',
+    ),
+    45 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Amsterdam',
+      'url' => 'https://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+    ),
+    46 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Den Haag',
+      'url' => 'http://mirror.serverion.com/mageia',
+    ),
+    47 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Den Haag',
+      'url' => 'https://mirror.serverion.com/mageia',
+    ),
+    48 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
+      'city' => 'Enschede',
+      'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
+    ),
+    49 => 
+    array (
+      'zone' => 'NL',
+      'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    44 => 
+    50 => 
     array (
       'zone' => 'NL',
       'country' => 'NL',
       'city' => 'Enschede',
       'url' => 'https://ftp.snt.utwente.nl/pub/os/linux/mageia',
     ),
-    45 => 
+    51 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    46 => 
+    52 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    47 => 
+    53 => 
     array (
       'zone' => 'PL',
       'country' => 'PL',
       'city' => 'Warszawa',
       'url' => 'https://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
     ),
-    48 => 
+    54 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'ftp://mirror.yandex.ru/mageia',
     ),
-    49 => 
+    55 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'http://mirror.yandex.ru/mageia',
     ),
-    50 => 
+    56 => 
     array (
       'zone' => 'RU',
       'country' => 'RU',
       'city' => 'Краснодар',
       'url' => 'https://mirror.yandex.ru/mageia',
     ),
-    51 => 
+    57 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'http://ftp.acc.umu.se/mirror/mageia',
     ),
-    52 => 
+    58 => 
     array (
       'zone' => 'SE',
       'country' => 'SE',
       'city' => 'Umeå',
       'url' => 'https://ftp.acc.umu.se/mirror/mageia',
     ),
-    53 => 
+    59 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
     ),
-    54 => 
+    60 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
       'city' => 'Vinnytsia',
       'url' => 'http://mageia.ip-connect.vn.ua',
     ),
-    55 => 
+    61 => 
     array (
       'zone' => 'UA',
       'country' => 'UA',
@@ -602,52 +623,45 @@
     array (
       'zone' => 'US',
       'country' => 'US',
-      'city' => 'Durham',
-      'url' => 'https://distro.ibiblio.org/mageia',
-    ),
-    5 => 
-    array (
-      'zone' => 'US',
-      'country' => 'US',
       'city' => 'Lenoir, NC',
       'url' => 'http://mirror.dacentec.com/mageia',
     ),
-    6 => 
+    5 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Lenoir, NC',
       'url' => 'https://mirror.dacentec.com/mageia',
     ),
-    7 => 
+    6 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
       'url' => 'http://mirror.math.princeton.edu/pub/mageia',
     ),
-    8 => 
+    7 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Princeton',
       'url' => 'https://mirror.math.princeton.edu/pub/mageia',
     ),
-    9 => 
+    8 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Richmond, VA',
       'url' => 'ftp://mageia.jameswhitby.net/mageia',
     ),
-    10 => 
+    9 => 
     array (
       'zone' => 'US',
       'country' => 'US',
       'city' => 'Richmond, VA',
       'url' => 'http://mageia.jameswhitby.net',
     ),
-    11 => 
+    10 => 
     array (
       'zone' => 'US',
       'country' => 'US',
@@ -671,6 +685,13 @@
       'city' => 'Brisbane',
       'url' => 'http://mirror.aarnet.edu.au/pub/mageia',
     ),
+    2 => 
+    array (
+      'zone' => 'AU',
+      'country' => 'AU',
+      'city' => 'Brisbane',
+      'url' => 'https://mirror.aarnet.edu.au/pub/mageia',
+    ),
   ),
   '_C:SA' => 
   array (