aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfilip <filip.komar@gmail.com>2019-02-23 23:38:13 +0100
committerfilip <filip.komar@gmail.com>2019-02-23 23:38:13 +0100
commit7058f2433557a922b00d0633d03db756eee4d5c6 (patch)
treedcd880b0fd77682829fdff8c39baca69c8c0714e
parent98a1dbc5e0ba40086fefbbc9c2d81eb183f00449 (diff)
updated mirror cache after Mageia7 beta2 release
-rw-r--r--lib/Downloads.php2
-rw-r--r--lib/cached.list.php156
-rw-r--r--lib/cached.list_doc.php140
-rw-r--r--lib/cached.list_mirrorlist.php128
4 files changed, 164 insertions, 262 deletions
diff --git a/lib/Downloads.php b/lib/Downloads.php
index 61169f7bb..2146d18aa 100644
--- a/lib/Downloads.php
+++ b/lib/Downloads.php
@@ -177,7 +177,7 @@ class Downloads
} else if ($mirrorlist) {
$test_file = $item['url'].'/distrib/6.1/x86_64/media/core/updates/repodata/repomd.xml';
} else {
- $test_file = $item['url'].'/iso/6.1/torrents/Mageia-6.1-LiveDVD-GNOME-x86_64-DVD.torrent';
+ $test_file = $item['url'].'/iso/cauldron/torrents/Mageia-7-beta2-x86_64.torrent';
}
if (false === @file_get_contents($test_file)) {
$num_dn++;
diff --git a/lib/cached.list.php b/lib/cached.list.php
index 34212d2aa..f144dbc70 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -37,106 +37,92 @@
'zone' => 'CN',
'country' => 'CN',
'city' => 'Hefei',
- 'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
- ),
- 3 =>
- array (
- 'zone' => 'CN',
- 'country' => 'CN',
- 'city' => 'Hefei',
'url' => 'http://mirrors.ustc.edu.cn/mageia',
),
- 4 =>
+ 3 =>
array (
'zone' => 'CN',
'country' => 'CN',
'city' => 'Hefei',
'url' => 'https://mirrors.ustc.edu.cn/mageia',
),
- 5 =>
+ 4 =>
array (
'zone' => 'IL',
'country' => 'IL',
'city' => '-',
'url' => 'http://mirror.isoc.org.il/pub/mageia',
),
- 6 =>
+ 5 =>
array (
'zone' => 'JP',
'country' => 'JP',
'city' => 'Tsukuba',
'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
),
- 7 =>
+ 6 =>
array (
'zone' => 'PH',
'country' => 'PH',
'city' => 'Cebu',
'url' => 'ftp://mirror.rise.ph/mageia',
),
- 8 =>
+ 7 =>
array (
'zone' => 'PH',
'country' => 'PH',
'city' => 'Cebu',
'url' => 'http://mirror.rise.ph/mageia',
),
- 9 =>
+ 8 =>
array (
'zone' => 'TR',
'country' => 'TR',
'city' => 'Ankara',
'url' => 'ftp://ftp.linux.org.tr/mageia',
),
- 10 =>
+ 9 =>
array (
'zone' => 'TR',
'country' => 'TR',
'city' => 'Ankara',
'url' => 'http://ftp.linux.org.tr/mageia',
),
- 11 =>
+ 10 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'Chungli',
'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
),
- 12 =>
+ 11 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'HsinChu',
'url' => 'ftp://free.nchc.org.tw/mageia',
),
- 13 =>
+ 12 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'HsinChu',
- 'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
+ 'url' => 'http://free.nchc.org.tw/mageia',
),
- 14 =>
+ 13 =>
array (
'zone' => 'TW',
'country' => 'TW',
- 'city' => 'HsinChu',
- 'url' => 'http://free.nchc.org.tw/mageia',
+ 'city' => 'Taipei',
+ 'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
),
- 15 =>
+ 14 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'Taipei',
'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
),
- 16 =>
- array (
- 'zone' => 'VN',
- 'country' => 'VN',
- 'city' => 'Ho chi minh City',
- 'url' => 'http://mirror.freedif.org/Mageia',
- ),
),
'_C:EU' =>
array (
@@ -179,304 +165,297 @@
array (
'zone' => 'CZ',
'country' => 'CZ',
+ 'city' => '-',
+ 'url' => 'http://mageia.supp.name',
+ ),
+ 6 =>
+ array (
+ 'zone' => 'CZ',
+ 'country' => 'CZ',
'city' => 'Brno',
'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia',
),
- 6 =>
+ 7 =>
array (
'zone' => 'CZ',
'country' => 'CZ',
'city' => 'Brno',
'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia',
),
- 7 =>
+ 8 =>
array (
'zone' => 'DE',
'country' => 'DE',
'city' => 'Düsseldorf',
'url' => 'http://mirror.tuxinator.org/mageia',
),
- 8 =>
+ 9 =>
array (
'zone' => 'DE',
'country' => 'DE',
'city' => 'Erlangen',
'url' => 'ftp://ftp.fau.de/mageia',
),
- 9 =>
+ 10 =>
array (
'zone' => 'DE',
'country' => 'DE',
'city' => 'Erlangen',
'url' => 'http://ftp.fau.de/mageia',
),
- 10 =>
+ 11 =>
array (
'zone' => 'DE',
'country' => 'DE',
'city' => 'Erlangen',
'url' => 'https://ftp.fau.de/mageia',
),
- 11 =>
+ 12 =>
array (
'zone' => 'DE',
'country' => 'DE',
'city' => 'Esslingen',
'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
),
- 12 =>
+ 13 =>
array (
'zone' => 'DE',
'country' => 'DE',
'city' => 'Esslingen',
'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
),
- 13 =>
+ 14 =>
array (
'zone' => 'DE',
'country' => 'DE',
'city' => 'Esslingen',
'url' => 'https://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia',
),
- 14 =>
+ 15 =>
array (
'zone' => 'DE',
'country' => 'DE',
'city' => 'Falkenstein/Vogtl.',
'url' => 'ftp://mirror2.tuxinator.org/mageia',
),
- 15 =>
+ 16 =>
array (
'zone' => 'DE',
'country' => 'DE',
'city' => 'Falkenstein/Vogtl.',
'url' => 'http://mirror2.tuxinator.org/mageia',
),
- 16 =>
+ 17 =>
array (
'zone' => 'DE',
'country' => 'DE',
'city' => 'Göttingen',
'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia',
),
- 17 =>
+ 18 =>
array (
'zone' => 'DE',
'country' => 'DE',
'city' => 'Göttingen',
'url' => 'http://ftp5.gwdg.de/pub/linux/mageia',
),
- 18 =>
+ 19 =>
array (
'zone' => 'DE',
'country' => 'DE',
'city' => 'Göttingen',
'url' => 'https://ftp5.gwdg.de/pub/linux/mageia',
),
- 19 =>
- array (
- 'zone' => 'DK',
- 'country' => 'DK',
- 'city' => 'DTU',
- 'url' => 'ftp://ftp.klid.dk/mageia',
- ),
20 =>
array (
- 'zone' => 'DK',
- 'country' => 'DK',
- 'city' => 'DTU',
- 'url' => 'http://ftp.klid.dk/ftp/mageia',
- ),
- 21 =>
- array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Lyon',
'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
),
- 22 =>
+ 21 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Lyon',
'url' => 'http://fr2.rpmfind.net/linux/mageia',
),
- 23 =>
+ 22 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
),
- 24 =>
+ 23 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
),
- 25 =>
+ 24 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
'url' => 'http://aglae.biomedicale.univ-paris5.fr',
),
- 26 =>
+ 25 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
),
- 27 =>
+ 26 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
'url' => 'http://ftp.free.fr/mirrors/mageia.org',
),
- 28 =>
+ 27 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
'url' => 'http://magie.remi.lu',
),
- 29 =>
+ 28 =>
array (
'zone' => 'GB',
'country' => 'GB',
'city' => 'Canterbury',
'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
),
- 30 =>
+ 29 =>
array (
'zone' => 'GB',
'country' => 'GB',
'city' => 'Canterbury',
'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
),
- 31 =>
+ 30 =>
array (
'zone' => 'GR',
'country' => 'GR',
'city' => 'Heraklion',
'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
),
- 32 =>
+ 31 =>
array (
'zone' => 'GR',
'country' => 'GR',
'city' => 'Heraklion',
'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
),
- 33 =>
+ 32 =>
array (
'zone' => 'IT',
'country' => 'IT',
'city' => 'Milan',
'url' => 'ftp://vodka.sublink.org/mageia',
),
- 34 =>
+ 33 =>
array (
'zone' => 'IT',
'country' => 'IT',
'city' => 'Milan',
'url' => 'http://vodka.sublink.org/mageia',
),
- 35 =>
+ 34 =>
array (
'zone' => 'IT',
'country' => 'IT',
'city' => 'Roma',
'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
),
- 36 =>
+ 35 =>
array (
'zone' => 'IT',
'country' => 'IT',
'city' => 'Roma',
'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
),
- 37 =>
+ 36 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Amsterdam',
'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
),
- 38 =>
+ 37 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Amsterdam',
'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
),
- 39 =>
+ 38 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Amsterdam',
'url' => 'http://mageia.mirror.triple-it.nl',
),
- 40 =>
+ 39 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Enschede',
'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
),
- 41 =>
+ 40 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Enschede',
'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
),
- 42 =>
+ 41 =>
array (
'zone' => 'PL',
'country' => 'PL',
'city' => 'Warszawa',
'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
),
- 43 =>
+ 42 =>
array (
'zone' => 'PL',
'country' => 'PL',
'city' => 'Warszawa',
'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
),
- 44 =>
+ 43 =>
array (
'zone' => 'RU',
'country' => 'RU',
- 'city' => 'Moscow',
+ 'city' => 'Краснодар',
'url' => 'ftp://mirror.yandex.ru/mageia',
),
- 45 =>
+ 44 =>
array (
'zone' => 'RU',
'country' => 'RU',
- 'city' => 'Moscow',
+ 'city' => 'Краснодар',
'url' => 'http://mirror.yandex.ru/mageia',
),
- 46 =>
+ 45 =>
array (
'zone' => 'SE',
'country' => 'SE',
'city' => 'Umeå',
'url' => 'http://ftp.acc.umu.se/mirror/mageia',
),
- 47 =>
+ 46 =>
array (
'zone' => 'UA',
'country' => 'UA',
'city' => 'Vinnytsia',
'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
),
- 48 =>
+ 47 =>
array (
'zone' => 'UA',
'country' => 'UA',
@@ -519,13 +498,6 @@
'zone' => 'US',
'country' => 'US',
'city' => 'RICHMOND',
- 'url' => 'ftp://mageia.jameswhitby.net/mageia',
- ),
- 5 =>
- array (
- 'zone' => 'US',
- 'country' => 'US',
- 'city' => 'RICHMOND',
'url' => 'http://mageia.jameswhitby.net/mageia',
),
),
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index 90bdcddf9..92012617b 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -37,119 +37,112 @@
'zone' => 'CN',
'country' => 'CN',
'city' => 'Hefei',
- 'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
- ),
- 3 =>
- array (
- 'zone' => 'CN',
- 'country' => 'CN',
- 'city' => 'Hefei',
'url' => 'http://mirrors.ustc.edu.cn/mageia',
),
- 4 =>
+ 3 =>
array (
'zone' => 'CN',
'country' => 'CN',
'city' => 'Hefei',
'url' => 'https://mirrors.ustc.edu.cn/mageia',
),
- 5 =>
+ 4 =>
array (
'zone' => 'CN',
'country' => 'CN',
'city' => 'Shanghai',
'url' => 'http://ftp.sjtu.edu.cn/mageia',
),
- 6 =>
+ 5 =>
array (
'zone' => 'CN',
'country' => 'CN',
'city' => 'Shanghai',
'url' => 'https://ftp.sjtu.edu.cn/mageia',
),
- 7 =>
+ 6 =>
array (
'zone' => 'JP',
'country' => 'JP',
'city' => 'Tsukuba',
'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
),
- 8 =>
+ 7 =>
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 =>
+ 9 =>
array (
'zone' => 'TR',
'country' => 'TR',
'city' => 'Ankara',
'url' => 'ftp://ftp.linux.org.tr/mageia',
),
- 11 =>
+ 10 =>
array (
'zone' => 'TR',
'country' => 'TR',
'city' => 'Ankara',
'url' => 'http://ftp.linux.org.tr/mageia',
),
- 12 =>
+ 11 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'Chungli',
'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
),
- 13 =>
+ 12 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'Chungli',
'url' => 'http://ftp.yzu.edu.tw/Linux/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',
'city' => 'Taipei',
- 'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
+ 'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
),
- 18 =>
+ 17 =>
array (
- 'zone' => 'VN',
- 'country' => 'VN',
- 'city' => 'Ho chi minh City',
- 'url' => 'http://mirror.freedif.org/Mageia',
+ 'zone' => 'TW',
+ 'country' => 'TW',
+ 'city' => 'Taipei',
+ 'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
),
),
'_C:EU' =>
@@ -296,222 +289,194 @@
),
20 =>
array (
- 'zone' => 'DK',
- 'country' => 'DK',
- 'city' => 'DTU',
- 'url' => 'ftp://ftp.klid.dk/mageia',
- ),
- 21 =>
- array (
- 'zone' => 'DK',
- 'country' => 'DK',
- 'city' => 'DTU',
- 'url' => 'http://ftp.klid.dk/ftp/mageia',
- ),
- 22 =>
- array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Lyon',
'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
),
- 23 =>
+ 21 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Lyon',
'url' => 'http://fr2.rpmfind.net/linux/mageia',
),
- 24 =>
+ 22 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
),
- 25 =>
+ 23 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
),
- 26 =>
+ 24 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
'url' => 'http://aglae.biomedicale.univ-paris5.fr',
),
- 27 =>
+ 25 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
),
- 28 =>
+ 26 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
'url' => 'http://ftp.free.fr/mirrors/mageia.org',
),
- 29 =>
+ 27 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
'url' => 'http://magie.remi.lu',
),
- 30 =>
+ 28 =>
array (
'zone' => 'GB',
'country' => 'GB',
'city' => 'Canterbury',
'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
),
- 31 =>
+ 29 =>
array (
'zone' => 'GB',
'country' => 'GB',
'city' => 'Canterbury',
'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
),
- 32 =>
+ 30 =>
array (
'zone' => 'GR',
'country' => 'GR',
'city' => 'Heraklion',
'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
),
- 33 =>
+ 31 =>
array (
'zone' => 'GR',
'country' => 'GR',
'city' => 'Heraklion',
'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
),
- 34 =>
+ 32 =>
array (
'zone' => 'IT',
'country' => 'IT',
'city' => 'Milan',
'url' => 'ftp://vodka.sublink.org/mageia',
),
- 35 =>
+ 33 =>
array (
'zone' => 'IT',
'country' => 'IT',
'city' => 'Milan',
'url' => 'http://vodka.sublink.org/mageia',
),
- 36 =>
+ 34 =>
array (
'zone' => 'IT',
'country' => 'IT',
'city' => 'Roma',
'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
),
- 37 =>
+ 35 =>
array (
'zone' => 'IT',
'country' => 'IT',
'city' => 'Roma',
'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
),
- 38 =>
+ 36 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Amsterdam',
'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
),
- 39 =>
+ 37 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Amsterdam',
'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
),
- 40 =>
+ 38 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Amsterdam',
'url' => 'http://mageia.mirror.triple-it.nl',
),
- 41 =>
+ 39 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Enschede',
'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
),
- 42 =>
+ 40 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Enschede',
'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
),
- 43 =>
- array (
- 'zone' => 'PL',
- 'country' => 'PL',
- 'city' => 'Krakow',
- 'url' => 'ftp://mirror.onet.pl/pub/mirrors/mageia',
- ),
- 44 =>
- array (
- 'zone' => 'PL',
- 'country' => 'PL',
- 'city' => 'Krakow',
- 'url' => 'http://mirror.onet.pl/pub/mirrors/mageia',
- ),
- 45 =>
+ 41 =>
array (
'zone' => 'PL',
'country' => 'PL',
'city' => 'Warszawa',
'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
),
- 46 =>
+ 42 =>
array (
'zone' => 'PL',
'country' => 'PL',
'city' => 'Warszawa',
'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
),
- 47 =>
+ 43 =>
array (
'zone' => 'RU',
'country' => 'RU',
- 'city' => 'Moscow',
+ 'city' => 'Краснодар',
'url' => 'ftp://mirror.yandex.ru/mageia',
),
- 48 =>
+ 44 =>
array (
'zone' => 'RU',
'country' => 'RU',
- 'city' => 'Moscow',
+ 'city' => 'Краснодар',
'url' => 'http://mirror.yandex.ru/mageia',
),
- 49 =>
+ 45 =>
array (
'zone' => 'SE',
'country' => 'SE',
'city' => 'Umeå',
'url' => 'http://ftp.acc.umu.se/mirror/mageia',
),
- 50 =>
+ 46 =>
array (
'zone' => 'UA',
'country' => 'UA',
'city' => 'Vinnytsia',
'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
),
- 51 =>
+ 47 =>
array (
'zone' => 'UA',
'country' => 'UA',
@@ -547,13 +512,6 @@
'zone' => 'US',
'country' => 'US',
'city' => 'RICHMOND',
- 'url' => 'ftp://mageia.jameswhitby.net/mageia',
- ),
- 4 =>
- array (
- 'zone' => 'US',
- 'country' => 'US',
- 'city' => 'RICHMOND',
'url' => 'http://mageia.jameswhitby.net/mageia',
),
),
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index b6de6684c..a3de8ed02 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -37,126 +37,119 @@
'zone' => 'CN',
'country' => 'CN',
'city' => 'Hefei',
- 'url' => 'ftp://mirrors.ustc.edu.cn/mageia',
- ),
- 3 =>
- array (
- 'zone' => 'CN',
- 'country' => 'CN',
- 'city' => 'Hefei',
'url' => 'http://mirrors.ustc.edu.cn/mageia',
),
- 4 =>
+ 3 =>
array (
'zone' => 'CN',
'country' => 'CN',
'city' => 'Hefei',
'url' => 'https://mirrors.ustc.edu.cn/mageia',
),
- 5 =>
+ 4 =>
array (
'zone' => 'CN',
'country' => 'CN',
'city' => 'Shanghai',
'url' => 'http://ftp.sjtu.edu.cn/mageia',
),
- 6 =>
+ 5 =>
array (
'zone' => 'CN',
'country' => 'CN',
'city' => 'Shanghai',
'url' => 'https://ftp.sjtu.edu.cn/mageia',
),
- 7 =>
+ 6 =>
array (
'zone' => 'IL',
'country' => 'IL',
'city' => '-',
'url' => 'http://mirror.isoc.org.il/pub/mageia',
),
- 8 =>
+ 7 =>
array (
'zone' => 'JP',
'country' => 'JP',
'city' => 'Tsukuba',
'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
),
- 9 =>
+ 8 =>
array (
'zone' => 'PH',
'country' => 'PH',
'city' => 'Cebu',
'url' => 'ftp://mirror.rise.ph/mageia',
),
- 10 =>
+ 9 =>
array (
'zone' => 'PH',
'country' => 'PH',
'city' => 'Cebu',
'url' => 'http://mirror.rise.ph/mageia',
),
- 11 =>
+ 10 =>
array (
'zone' => 'TR',
'country' => 'TR',
'city' => 'Ankara',
'url' => 'ftp://ftp.linux.org.tr/mageia',
),
- 12 =>
+ 11 =>
array (
'zone' => 'TR',
'country' => 'TR',
'city' => 'Ankara',
'url' => 'http://ftp.linux.org.tr/mageia',
),
- 13 =>
+ 12 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'Chungli',
'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
),
- 14 =>
+ 13 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'Chungli',
'url' => 'http://ftp.yzu.edu.tw/Linux/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',
'city' => 'Taipei',
- 'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
+ 'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
),
- 19 =>
+ 18 =>
array (
- 'zone' => 'VN',
- 'country' => 'VN',
- 'city' => 'Ho chi minh City',
- 'url' => 'http://mirror.freedif.org/Mageia',
+ 'zone' => 'TW',
+ 'country' => 'TW',
+ 'city' => 'Taipei',
+ 'url' => 'http://ftp.tku.edu.tw/Linux/Mageia',
),
),
'_C:EU' =>
@@ -303,208 +296,194 @@
),
20 =>
array (
- 'zone' => 'DK',
- 'country' => 'DK',
- 'city' => 'DTU',
- 'url' => 'ftp://ftp.klid.dk/mageia',
- ),
- 21 =>
- array (
- 'zone' => 'DK',
- 'country' => 'DK',
- 'city' => 'DTU',
- 'url' => 'http://ftp.klid.dk/ftp/mageia',
- ),
- 22 =>
- array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Lyon',
'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
),
- 23 =>
+ 21 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Lyon',
'url' => 'http://fr2.rpmfind.net/linux/mageia',
),
- 24 =>
+ 22 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
),
- 25 =>
+ 23 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
),
- 26 =>
+ 24 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
'url' => 'http://aglae.biomedicale.univ-paris5.fr',
),
- 27 =>
+ 25 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
),
- 28 =>
+ 26 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
'url' => 'http://ftp.free.fr/mirrors/mageia.org',
),
- 29 =>
+ 27 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
'url' => 'http://magie.remi.lu',
),
- 30 =>
+ 28 =>
array (
'zone' => 'GB',
'country' => 'GB',
'city' => 'Canterbury',
'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia',
),
- 31 =>
+ 29 =>
array (
'zone' => 'GB',
'country' => 'GB',
'city' => 'Canterbury',
'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia',
),
- 32 =>
+ 30 =>
array (
'zone' => 'GR',
'country' => 'GR',
'city' => 'Heraklion',
'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia',
),
- 33 =>
+ 31 =>
array (
'zone' => 'GR',
'country' => 'GR',
'city' => 'Heraklion',
'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia',
),
- 34 =>
+ 32 =>
array (
'zone' => 'IT',
'country' => 'IT',
'city' => 'Milan',
'url' => 'ftp://vodka.sublink.org/mageia',
),
- 35 =>
+ 33 =>
array (
'zone' => 'IT',
'country' => 'IT',
'city' => 'Milan',
'url' => 'http://vodka.sublink.org/mageia',
),
- 36 =>
+ 34 =>
array (
'zone' => 'IT',
'country' => 'IT',
'city' => 'Roma',
'url' => 'ftp://mageia.mirror.garr.it/mirrors/mageia',
),
- 37 =>
+ 35 =>
array (
'zone' => 'IT',
'country' => 'IT',
'city' => 'Roma',
'url' => 'http://mageia.mirror.garr.it/mirrors/mageia',
),
- 38 =>
+ 36 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Amsterdam',
'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
),
- 39 =>
+ 37 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Amsterdam',
'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
),
- 40 =>
+ 38 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Amsterdam',
'url' => 'http://mageia.mirror.triple-it.nl',
),
- 41 =>
+ 39 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Enschede',
'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
),
- 42 =>
+ 40 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Enschede',
'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia',
),
- 43 =>
+ 41 =>
array (
'zone' => 'PL',
'country' => 'PL',
'city' => 'Warszawa',
'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
),
- 44 =>
+ 42 =>
array (
'zone' => 'PL',
'country' => 'PL',
'city' => 'Warszawa',
'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia',
),
- 45 =>
+ 43 =>
array (
'zone' => 'RU',
'country' => 'RU',
- 'city' => 'Moscow',
+ 'city' => 'Краснодар',
'url' => 'ftp://mirror.yandex.ru/mageia',
),
- 46 =>
+ 44 =>
array (
'zone' => 'RU',
'country' => 'RU',
- 'city' => 'Moscow',
+ 'city' => 'Краснодар',
'url' => 'http://mirror.yandex.ru/mageia',
),
- 47 =>
+ 45 =>
array (
'zone' => 'SE',
'country' => 'SE',
'city' => 'Umeå',
'url' => 'http://ftp.acc.umu.se/mirror/mageia',
),
- 48 =>
+ 46 =>
array (
'zone' => 'UA',
'country' => 'UA',
'city' => 'Vinnytsia',
'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia',
),
- 49 =>
+ 47 =>
array (
'zone' => 'UA',
'country' => 'UA',
@@ -547,13 +526,6 @@
'zone' => 'US',
'country' => 'US',
'city' => 'RICHMOND',
- 'url' => 'ftp://mageia.jameswhitby.net/mageia',
- ),
- 5 =>
- array (
- 'zone' => 'US',
- 'country' => 'US',
- 'city' => 'RICHMOND',
'url' => 'http://mageia.jameswhitby.net/mageia',
),
),