From 36624a0337415c107e4f8017d7c10c74679f02e7 Mon Sep 17 00:00:00 2001 From: filip Date: Sat, 28 Apr 2018 01:30:36 +0200 Subject: update mirror lists + api switch to 6 --- lib/Downloads.php | 4 +- lib/cached.list.php | 285 ++++++++++++++++++++++++++------------- lib/cached.list_doc.php | 271 ++++++++++++++++++++++++------------- lib/cached.list_mirrorlist.php | 299 +++++++++++++++++++++++++++-------------- 4 files changed, 571 insertions(+), 288 deletions(-) (limited to 'lib') diff --git a/lib/Downloads.php b/lib/Downloads.php index dc955d431..84ac39607 100644 --- a/lib/Downloads.php +++ b/lib/Downloads.php @@ -149,7 +149,7 @@ class Downloads require $cache_file; } else { - $data = file('http://mirrors.mageia.org/api/mageia.5.i586.list'); + $data = file('http://mirrors.mageia.org/api/mageia.6.i586.list'); $mirrors = array(); $num_up = 0; $num_dn = 0; @@ -169,7 +169,7 @@ class Downloads 'country' => isset($m['country']) ? $m['country'] : '?', 'city' => isset($m['city']) ? utf8_encode($m['city']) : '-', // BEWARE of the path substitution here. Must match. - 'url' => str_replace('/distrib/5/i586', '', $m['url']) + 'url' => str_replace('/distrib/6/i586', '', $m['url']) ); if ($documentation) { diff --git a/lib/cached.list.php b/lib/cached.list.php index cd88678c6..d8a4bb1be 100644 --- a/lib/cached.list.php +++ b/lib/cached.list.php @@ -8,13 +8,6 @@ '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', - ), ), '_C:AS' => array ( @@ -58,14 +51,14 @@ 'zone' => 'CN', 'country' => 'CN', 'city' => 'Shanghai', - 'url' => 'http://ftp.sjtu.edu.cn/mageia', + 'url' => 'https://ftp.sjtu.edu.cn/mageia', ), 6 => array ( - 'zone' => 'CN', - 'country' => 'CN', - 'city' => 'Shanghai', - 'url' => 'https://ftp.sjtu.edu.cn/mageia', + 'zone' => 'IL', + 'country' => 'IL', + 'city' => '-', + 'url' => 'http://mirror.isoc.org.il/pub/mageia', ), 7 => array ( @@ -90,47 +83,54 @@ ), 10 => array ( - 'zone' => 'TW', - 'country' => 'TW', - 'city' => 'Chungli', - 'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia', + '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 => array ( 'zone' => 'TW', 'country' => 'TW', - 'city' => 'HsinChu', - 'url' => 'ftp://free.nchc.org.tw/mageia', + 'city' => 'Chungli', + 'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia', ), - 12 => + 13 => array ( 'zone' => 'TW', 'country' => 'TW', 'city' => 'HsinChu', 'url' => 'ftp://ftp.twaren.net/Linux/Mageia', ), - 13 => + 14 => array ( 'zone' => 'TW', 'country' => 'TW', 'city' => 'HsinChu', 'url' => 'http://free.nchc.org.tw/mageia', ), - 14 => + 15 => array ( 'zone' => 'TW', 'country' => 'TW', 'city' => 'Taipei', 'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia', ), - 15 => + 16 => array ( 'zone' => 'TW', 'country' => 'TW', 'city' => 'Taipei', 'url' => 'http://ftp.tku.edu.tw/Linux/Mageia', ), - 16 => + 17 => array ( 'zone' => 'VN', 'country' => 'VN', @@ -141,53 +141,53 @@ '_C:EU' => array ( 0 => - array ( - 'zone' => 'BE', - 'country' => 'BE', - 'city' => 'Brussels', - 'url' => 'ftp://ftp.belnet.be/mirror/mageia', - ), - 1 => array ( 'zone' => 'BG', 'country' => 'BG', 'city' => 'Sofia', 'url' => 'ftp://mirrors.netix.net/mageia', ), - 2 => + 1 => array ( 'zone' => 'BG', 'country' => 'BG', 'city' => 'Sofia', 'url' => 'http://mirrors.netix.net/mageia', ), - 3 => + 2 => array ( 'zone' => 'BY', 'country' => 'BY', 'city' => 'Minsk', 'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org', ), - 4 => + 3 => array ( 'zone' => 'BY', 'country' => 'BY', 'city' => 'Minsk', 'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org', ), - 5 => + 4 => array ( 'zone' => 'CZ', 'country' => 'CZ', 'city' => '-', 'url' => 'http://mageia.supp.name', ), + 5 => + array ( + 'zone' => 'CZ', + 'country' => 'CZ', + 'city' => 'Brno', + 'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia', + ), 6 => array ( - 'zone' => 'DE', - 'country' => 'DE', - 'city' => 'Cologne', - 'url' => 'ftp://mirror.netcologne.de/mageia', + 'zone' => 'CZ', + 'country' => 'CZ', + 'city' => 'Brno', + 'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia', ), 7 => array ( @@ -200,249 +200,343 @@ array ( 'zone' => 'DE', 'country' => 'DE', - 'city' => 'Erlangen', - 'url' => 'ftp://ftp.fau.de/mageia', + 'city' => 'Düsseldorf', + 'url' => 'http://mirror.tuxinator.org/mageia', ), 9 => array ( 'zone' => 'DE', 'country' => 'DE', 'city' => 'Erlangen', - 'url' => 'http://ftp.fau.de/mageia', + 'url' => 'ftp://ftp.fau.de/mageia', ), 10 => array ( 'zone' => 'DE', 'country' => 'DE', 'city' => 'Erlangen', - 'url' => 'https://ftp.fau.de/mageia', + 'url' => 'http://ftp.fau.de/mageia', ), 11 => array ( 'zone' => 'DE', 'country' => 'DE', - 'city' => 'Hermsdorf', - 'url' => 'http://mirror.tuxinator.org/mageia', + 'city' => 'Erlangen', + 'url' => 'https://ftp.fau.de/mageia', ), 12 => array ( 'zone' => 'DE', 'country' => 'DE', - 'city' => 'freiburg', - 'url' => 'ftp://mirror2.tuxinator.org/mageia', + 'city' => 'Esslingen', + 'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia', ), 13 => array ( 'zone' => 'DE', 'country' => 'DE', - 'city' => 'freiburg', - 'url' => 'http://mirror2.tuxinator.org/mageia', + 'city' => 'Esslingen', + 'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia', ), 14 => + array ( + 'zone' => 'DE', + 'country' => 'DE', + 'city' => 'Esslingen', + 'url' => 'https://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia', + ), + 15 => + array ( + 'zone' => 'DE', + 'country' => 'DE', + 'city' => 'Falkenstein/Vogtl.', + 'url' => 'http://mirror2.tuxinator.org/mageia', + ), + 16 => + array ( + 'zone' => 'DE', + 'country' => 'DE', + 'city' => 'Göttingen', + 'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia', + ), + 17 => + array ( + 'zone' => 'DE', + 'country' => 'DE', + 'city' => 'Göttingen', + 'url' => 'http://ftp5.gwdg.de/pub/linux/mageia', + ), + 18 => + 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', ), - 15 => + 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 => + array ( + 'zone' => 'FR', + 'country' => 'FR', + 'city' => 'Lyon', + 'url' => 'http://fr2.rpmfind.net/linux/mageia', + ), + 23 => array ( 'zone' => 'FR', 'country' => 'FR', 'city' => 'Paris', 'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia', ), - 16 => + 24 => array ( 'zone' => 'FR', 'country' => 'FR', 'city' => 'Paris', 'url' => 'ftp://ftp.free.fr/mirrors/mageia.org', ), - 17 => + 25 => array ( 'zone' => 'FR', 'country' => 'FR', 'city' => 'Paris', 'url' => 'http://aglae.biomedicale.univ-paris5.fr', ), - 18 => + 26 => array ( 'zone' => 'FR', 'country' => 'FR', 'city' => 'Paris', 'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia', ), - 19 => + 27 => array ( 'zone' => 'FR', 'country' => 'FR', 'city' => 'Paris', 'url' => 'http://ftp.free.fr/mirrors/mageia.org', ), - 20 => + 28 => array ( 'zone' => 'FR', 'country' => 'FR', - 'city' => 'Rennes', + 'city' => 'Paris', 'url' => 'http://magie.remi.lu', ), - 21 => + 29 => array ( 'zone' => 'GB', 'country' => 'GB', 'city' => 'Canterbury', 'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia', ), - 22 => + 30 => array ( 'zone' => 'GB', 'country' => 'GB', 'city' => 'Canterbury', 'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia', ), - 23 => + 31 => array ( 'zone' => 'GR', 'country' => 'GR', 'city' => 'Heraklion', 'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia', ), - 24 => + 32 => array ( 'zone' => 'GR', 'country' => 'GR', 'city' => 'Heraklion', 'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia', ), - 25 => + 33 => + array ( + 'zone' => 'IT', + 'country' => 'IT', + 'city' => 'Milan', + 'url' => 'ftp://vodka.sublink.org/mageia', + ), + 34 => + array ( + 'zone' => 'IT', + 'country' => 'IT', + 'city' => 'Milan', + 'url' => 'http://vodka.sublink.org/mageia', + ), + 35 => + array ( + 'zone' => 'IT', + 'country' => 'IT', + 'city' => 'Roma', + 'url' => 'http://mageia.mirror.garr.it/mirrors/mageia', + ), + 36 => array ( 'zone' => 'NL', 'country' => 'NL', 'city' => 'Amsterdam', 'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia', ), - 26 => + 37 => array ( 'zone' => 'NL', 'country' => 'NL', 'city' => 'Amsterdam', 'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia', ), - 27 => + 38 => array ( 'zone' => 'NL', 'country' => 'NL', 'city' => 'Amsterdam', 'url' => 'http://mageia.mirror.triple-it.nl', ), - 28 => + 39 => array ( 'zone' => 'NL', 'country' => 'NL', 'city' => 'Enschede', 'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia', ), - 29 => + 40 => array ( 'zone' => 'NL', 'country' => 'NL', 'city' => 'Enschede', 'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia', ), - 30 => + 41 => array ( 'zone' => 'PL', 'country' => 'PL', 'city' => 'Krakow', 'url' => 'ftp://mirror.onet.pl/pub/mirrors/mageia', ), - 31 => + 42 => array ( 'zone' => 'PL', 'country' => 'PL', 'city' => 'Krakow', 'url' => 'http://mirror.onet.pl/pub/mirrors/mageia', ), - 32 => + 43 => + array ( + 'zone' => 'PL', + 'country' => 'PL', + 'city' => 'Warszawa', + 'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia', + ), + 44 => + array ( + 'zone' => 'PL', + 'country' => 'PL', + 'city' => 'Warszawa', + 'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia', + ), + 45 => array ( 'zone' => 'RU', 'country' => 'RU', 'city' => 'Moscow', 'url' => 'ftp://mirror.yandex.ru/mageia', ), - 33 => + 46 => array ( 'zone' => 'RU', 'country' => 'RU', 'city' => 'Moscow', 'url' => 'http://mirror.yandex.ru/mageia', ), - 34 => + 47 => array ( 'zone' => 'SE', 'country' => 'SE', - 'city' => 'Umeå', + 'city' => 'UmeÃ¥', 'url' => 'http://ftp.acc.umu.se/mirror/mageia', ), - 35 => + 48 => array ( 'zone' => 'UA', 'country' => 'UA', 'city' => 'Vinnytsia', 'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia', ), - 36 => - array ( - 'zone' => 'UA', - 'country' => 'UA', - 'city' => 'Vinnytsia', - 'url' => 'http://mageia.ip-connect.vn.ua', - ), ), '_C:NA' => array ( 0 => + array ( + 'zone' => 'CA', + 'country' => 'CA', + 'city' => 'Beauharnois', + 'url' => 'https://mirror.softiternity.com/Mageia', + ), + 1 => array ( 'zone' => 'US', 'country' => 'US', 'city' => '-', 'url' => 'http://mirrors.kernel.org/mageia', ), - 1 => + 2 => array ( 'zone' => 'US', 'country' => 'US', 'city' => 'Durham', 'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia', ), - 2 => + 3 => array ( 'zone' => 'US', 'country' => 'US', 'city' => 'Lenoir', 'url' => 'http://mirror.dacentec.com/mageia', ), - 3 => + 4 => array ( 'zone' => 'US', 'country' => 'US', 'city' => 'Princeton', 'url' => 'http://mirror.math.princeton.edu/pub/mageia', ), - 4 => + 5 => array ( 'zone' => 'US', 'country' => 'US', 'city' => 'RICHMOND', 'url' => 'ftp://mageia.jameswhitby.net/mageia', ), - 5 => + ), + '_C:OC' => + array ( + 0 => array ( - 'zone' => 'US', - 'country' => 'US', - 'city' => 'RICHMOND', - 'url' => 'http://mageia.jameswhitby.net/mageia', + 'zone' => 'AU', + 'country' => 'AU', + 'city' => 'Brisbane', + 'url' => 'http://mirror.aarnet.edu.au/pub/mageia', ), ), '_C:SA' => @@ -466,14 +560,21 @@ 'zone' => 'BR', 'country' => 'BR', 'city' => 'Brasilia', - 'url' => 'ftp://mageia.fis.unb.br/linux/mageia', + 'url' => 'http://mageia.fis.unb.br', ), 3 => array ( - 'zone' => 'BR', - 'country' => 'BR', - 'city' => 'Brasilia', - 'url' => 'http://mageia.fis.unb.br', + 'zone' => 'EC', + 'country' => 'EC', + 'city' => 'Cuenca', + 'url' => 'ftp://mirror.cedia.org.ec/mageia', + ), + 4 => + array ( + 'zone' => 'EC', + 'country' => 'EC', + 'city' => 'Cuenca', + 'url' => 'http://mirror.cedia.org.ec/mageia', ), ), ); ?> diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php index 2559b4b9d..ffa6f368d 100644 --- a/lib/cached.list_doc.php +++ b/lib/cached.list_doc.php @@ -8,13 +8,6 @@ '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', - ), ), '_C:AS' => array ( @@ -54,60 +47,60 @@ 'url' => 'https://mirrors.ustc.edu.cn/mageia', ), 5 => - array ( - 'zone' => 'CN', - 'country' => 'CN', - 'city' => 'Shanghai', - 'url' => 'http://ftp.sjtu.edu.cn/mageia', - ), - 6 => 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', ), + 9 => + array ( + 'zone' => 'TR', + 'country' => 'TR', + 'city' => 'Ankara', + 'url' => 'ftp://ftp.linux.org.tr/mageia', + ), 10 => array ( - 'zone' => 'TW', - 'country' => 'TW', - 'city' => 'Chungli', - 'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia', + 'zone' => 'TR', + 'country' => 'TR', + 'city' => 'Ankara', + 'url' => 'http://ftp.linux.org.tr/mageia', ), 11 => array ( 'zone' => 'TW', 'country' => 'TW', 'city' => 'Chungli', - 'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia', + 'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia', ), 12 => array ( 'zone' => 'TW', 'country' => 'TW', - 'city' => 'HsinChu', - 'url' => 'ftp://free.nchc.org.tw/mageia', + 'city' => 'Chungli', + 'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia', ), 13 => array ( @@ -148,53 +141,53 @@ '_C:EU' => array ( 0 => - array ( - 'zone' => 'BE', - 'country' => 'BE', - 'city' => 'Brussels', - 'url' => 'ftp://ftp.belnet.be/mirror/mageia', - ), - 1 => array ( 'zone' => 'BG', 'country' => 'BG', 'city' => 'Sofia', 'url' => 'ftp://mirrors.netix.net/mageia', ), - 2 => + 1 => array ( 'zone' => 'BG', 'country' => 'BG', 'city' => 'Sofia', 'url' => 'http://mirrors.netix.net/mageia', ), - 3 => + 2 => array ( 'zone' => 'BY', 'country' => 'BY', 'city' => 'Minsk', 'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org', ), - 4 => + 3 => array ( 'zone' => 'BY', 'country' => 'BY', 'city' => 'Minsk', 'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org', ), - 5 => + 4 => array ( 'zone' => 'CZ', 'country' => 'CZ', 'city' => '-', 'url' => 'http://mageia.supp.name', ), + 5 => + array ( + 'zone' => 'CZ', + 'country' => 'CZ', + 'city' => 'Brno', + 'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia', + ), 6 => array ( - 'zone' => 'DE', - 'country' => 'DE', - 'city' => 'Cologne', - 'url' => 'ftp://mirror.netcologne.de/mageia', + 'zone' => 'CZ', + 'country' => 'CZ', + 'city' => 'Brno', + 'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia', ), 7 => array ( @@ -207,198 +200,289 @@ array ( 'zone' => 'DE', 'country' => 'DE', - 'city' => 'Erlangen', - 'url' => 'ftp://ftp.fau.de/mageia', + 'city' => 'Düsseldorf', + 'url' => 'http://mirror.tuxinator.org/mageia', ), 9 => array ( 'zone' => 'DE', 'country' => 'DE', 'city' => 'Erlangen', - 'url' => 'http://ftp.fau.de/mageia', + 'url' => 'ftp://ftp.fau.de/mageia', ), 10 => array ( 'zone' => 'DE', 'country' => 'DE', 'city' => 'Erlangen', - 'url' => 'https://ftp.fau.de/mageia', + 'url' => 'http://ftp.fau.de/mageia', ), 11 => array ( 'zone' => 'DE', 'country' => 'DE', - 'city' => 'Hermsdorf', - 'url' => 'http://mirror.tuxinator.org/mageia', + 'city' => 'Erlangen', + 'url' => 'https://ftp.fau.de/mageia', ), 12 => array ( 'zone' => 'DE', 'country' => 'DE', - 'city' => 'freiburg', - 'url' => 'ftp://mirror2.tuxinator.org/mageia', + 'city' => 'Esslingen', + 'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia', ), 13 => array ( 'zone' => 'DE', 'country' => 'DE', - 'city' => 'freiburg', - 'url' => 'http://mirror2.tuxinator.org/mageia', + 'city' => 'Esslingen', + 'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia', ), 14 => + array ( + 'zone' => 'DE', + 'country' => 'DE', + 'city' => 'Esslingen', + 'url' => 'https://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia', + ), + 15 => + array ( + 'zone' => 'DE', + 'country' => 'DE', + 'city' => 'Falkenstein/Vogtl.', + 'url' => 'http://mirror2.tuxinator.org/mageia', + ), + 16 => + array ( + 'zone' => 'DE', + 'country' => 'DE', + 'city' => 'Göttingen', + 'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia', + ), + 17 => + array ( + 'zone' => 'DE', + 'country' => 'DE', + 'city' => 'Göttingen', + 'url' => 'http://ftp5.gwdg.de/pub/linux/mageia', + ), + 18 => + 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', ), - 15 => + 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 => + array ( + 'zone' => 'FR', + 'country' => 'FR', + 'city' => 'Lyon', + 'url' => 'http://fr2.rpmfind.net/linux/mageia', + ), + 23 => array ( 'zone' => 'FR', 'country' => 'FR', 'city' => 'Paris', 'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia', ), - 16 => + 24 => array ( 'zone' => 'FR', 'country' => 'FR', 'city' => 'Paris', 'url' => 'ftp://ftp.free.fr/mirrors/mageia.org', ), - 17 => + 25 => array ( 'zone' => 'FR', 'country' => 'FR', 'city' => 'Paris', 'url' => 'http://aglae.biomedicale.univ-paris5.fr', ), - 18 => + 26 => + array ( + 'zone' => 'FR', + 'country' => 'FR', + 'city' => 'Paris', + 'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia', + ), + 27 => array ( 'zone' => 'FR', 'country' => 'FR', 'city' => 'Paris', 'url' => 'http://ftp.free.fr/mirrors/mageia.org', ), - 19 => + 28 => array ( 'zone' => 'FR', 'country' => 'FR', - 'city' => 'Rennes', + 'city' => 'Paris', 'url' => 'http://magie.remi.lu', ), - 20 => + 29 => array ( 'zone' => 'GB', 'country' => 'GB', 'city' => 'Canterbury', 'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia', ), - 21 => + 30 => array ( 'zone' => 'GB', 'country' => 'GB', 'city' => 'Canterbury', 'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia', ), - 22 => + 31 => array ( 'zone' => 'GR', 'country' => 'GR', 'city' => 'Heraklion', 'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia', ), - 23 => + 32 => array ( 'zone' => 'GR', 'country' => 'GR', 'city' => 'Heraklion', 'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia', ), - 24 => + 33 => + array ( + 'zone' => 'IT', + 'country' => 'IT', + 'city' => 'Milan', + 'url' => 'ftp://vodka.sublink.org/mageia', + ), + 34 => + array ( + 'zone' => 'IT', + 'country' => 'IT', + 'city' => 'Milan', + 'url' => 'http://vodka.sublink.org/mageia', + ), + 35 => + array ( + 'zone' => 'IT', + 'country' => 'IT', + 'city' => 'Roma', + 'url' => 'http://mageia.mirror.garr.it/mirrors/mageia', + ), + 36 => array ( 'zone' => 'NL', 'country' => 'NL', 'city' => 'Amsterdam', 'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia', ), - 25 => + 37 => array ( 'zone' => 'NL', 'country' => 'NL', 'city' => 'Amsterdam', 'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia', ), - 26 => + 38 => array ( 'zone' => 'NL', 'country' => 'NL', 'city' => 'Amsterdam', 'url' => 'http://mageia.mirror.triple-it.nl', ), - 27 => + 39 => array ( 'zone' => 'NL', 'country' => 'NL', 'city' => 'Enschede', 'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia', ), - 28 => + 40 => array ( 'zone' => 'NL', 'country' => 'NL', 'city' => 'Enschede', 'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia', ), - 29 => + 41 => array ( 'zone' => 'PL', 'country' => 'PL', 'city' => 'Krakow', 'url' => 'ftp://mirror.onet.pl/pub/mirrors/mageia', ), - 30 => + 42 => array ( 'zone' => 'PL', 'country' => 'PL', 'city' => 'Krakow', 'url' => 'http://mirror.onet.pl/pub/mirrors/mageia', ), - 31 => + 43 => + array ( + 'zone' => 'PL', + 'country' => 'PL', + 'city' => 'Warszawa', + 'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia', + ), + 44 => + array ( + 'zone' => 'PL', + 'country' => 'PL', + 'city' => 'Warszawa', + 'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia', + ), + 45 => array ( 'zone' => 'RU', 'country' => 'RU', 'city' => 'Moscow', 'url' => 'ftp://mirror.yandex.ru/mageia', ), - 32 => + 46 => array ( 'zone' => 'RU', 'country' => 'RU', 'city' => 'Moscow', 'url' => 'http://mirror.yandex.ru/mageia', ), - 33 => + 47 => array ( 'zone' => 'SE', 'country' => 'SE', - 'city' => 'Umeå', + 'city' => 'UmeÃ¥', 'url' => 'http://ftp.acc.umu.se/mirror/mageia', ), - 34 => + 48 => array ( 'zone' => 'UA', 'country' => 'UA', 'city' => 'Vinnytsia', 'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia', ), - 35 => - array ( - 'zone' => 'UA', - 'country' => 'UA', - 'city' => 'Vinnytsia', - 'url' => 'http://mageia.ip-connect.vn.ua', - ), ), '_C:NA' => array ( @@ -430,13 +514,6 @@ 'city' => 'RICHMOND', 'url' => 'ftp://mageia.jameswhitby.net/mageia', ), - 4 => - array ( - 'zone' => 'US', - 'country' => 'US', - 'city' => 'RICHMOND', - 'url' => 'http://mageia.jameswhitby.net/mageia', - ), ), '_C:OC' => array ( @@ -447,6 +524,13 @@ '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', + ), ), '_C:SA' => array ( @@ -469,14 +553,21 @@ 'zone' => 'BR', 'country' => 'BR', 'city' => 'Brasilia', - 'url' => 'ftp://mageia.fis.unb.br/linux/mageia', + 'url' => 'http://mageia.fis.unb.br', ), 3 => array ( - 'zone' => 'BR', - 'country' => 'BR', - 'city' => 'Brasilia', - 'url' => 'http://mageia.fis.unb.br', + 'zone' => 'EC', + 'country' => 'EC', + 'city' => 'Cuenca', + 'url' => 'ftp://mirror.cedia.org.ec/mageia', + ), + 4 => + array ( + 'zone' => 'EC', + 'country' => 'EC', + 'city' => 'Cuenca', + 'url' => 'http://mirror.cedia.org.ec/mageia', ), ), ); ?> diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php index 5f8b0ce47..5450efab7 100644 --- a/lib/cached.list_mirrorlist.php +++ b/lib/cached.list_mirrorlist.php @@ -8,13 +8,6 @@ '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', - ), ), '_C:AS' => array ( @@ -58,14 +51,14 @@ 'zone' => 'CN', 'country' => 'CN', 'city' => 'Shanghai', - 'url' => 'http://ftp.sjtu.edu.cn/mageia', + 'url' => 'https://ftp.sjtu.edu.cn/mageia', ), 6 => array ( - 'zone' => 'CN', - 'country' => 'CN', - 'city' => 'Shanghai', - 'url' => 'https://ftp.sjtu.edu.cn/mageia', + 'zone' => 'IL', + 'country' => 'IL', + 'city' => '-', + 'url' => 'http://mirror.isoc.org.il/pub/mageia', ), 7 => array ( @@ -90,54 +83,61 @@ ), 10 => array ( - 'zone' => 'TW', - 'country' => 'TW', - 'city' => 'Chungli', - 'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia', + '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 => array ( 'zone' => 'TW', 'country' => 'TW', 'city' => 'Chungli', - 'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia', + 'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia', ), - 12 => + 13 => array ( 'zone' => 'TW', 'country' => 'TW', - 'city' => 'HsinChu', - 'url' => 'ftp://free.nchc.org.tw/mageia', + 'city' => 'Chungli', + 'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia', ), - 13 => + 14 => array ( 'zone' => 'TW', 'country' => 'TW', 'city' => 'HsinChu', 'url' => 'ftp://ftp.twaren.net/Linux/Mageia', ), - 14 => + 15 => array ( 'zone' => 'TW', 'country' => 'TW', 'city' => 'HsinChu', 'url' => 'http://free.nchc.org.tw/mageia', ), - 15 => + 16 => array ( 'zone' => 'TW', 'country' => 'TW', 'city' => 'Taipei', 'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia', ), - 16 => + 17 => array ( 'zone' => 'TW', 'country' => 'TW', 'city' => 'Taipei', 'url' => 'http://ftp.tku.edu.tw/Linux/Mageia', ), - 17 => + 18 => array ( 'zone' => 'VN', 'country' => 'VN', @@ -148,40 +148,40 @@ '_C:EU' => array ( 0 => - array ( - 'zone' => 'BE', - 'country' => 'BE', - 'city' => 'Brussels', - 'url' => 'ftp://ftp.belnet.be/mirror/mageia', - ), - 1 => array ( 'zone' => 'BG', 'country' => 'BG', 'city' => 'Sofia', 'url' => 'ftp://mirrors.netix.net/mageia', ), - 2 => + 1 => array ( 'zone' => 'BG', 'country' => 'BG', 'city' => 'Sofia', 'url' => 'http://mirrors.netix.net/mageia', ), - 3 => + 2 => array ( 'zone' => 'BY', 'country' => 'BY', 'city' => 'Minsk', 'url' => 'ftp://mirror.datacenter.by/pub/mirrors/mageia.org', ), - 4 => + 3 => array ( 'zone' => 'BY', 'country' => 'BY', 'city' => 'Minsk', 'url' => 'http://mirror.datacenter.by/pub/mirrors/mageia.org', ), + 4 => + array ( + 'zone' => 'CH', + 'country' => 'CH', + 'city' => 'geneva', + 'url' => 'http://mageia.unige.ch/mirror', + ), 5 => array ( 'zone' => 'CZ', @@ -191,279 +191,356 @@ ), 6 => array ( - 'zone' => 'DE', - 'country' => 'DE', - 'city' => 'Cologne', - 'url' => 'ftp://mirror.netcologne.de/mageia', + 'zone' => 'CZ', + 'country' => 'CZ', + 'city' => 'Brno', + 'url' => 'ftp://ftp.fi.muni.cz/pub/linux/mageia', ), 7 => array ( - 'zone' => 'DE', - 'country' => 'DE', - 'city' => 'Cologne', - 'url' => 'http://mirror.netcologne.de/mageia', + 'zone' => 'CZ', + 'country' => 'CZ', + 'city' => 'Brno', + 'url' => 'http://ftp.fi.muni.cz/pub/linux/mageia', ), 8 => array ( 'zone' => 'DE', 'country' => 'DE', - 'city' => 'Erlangen', - 'url' => 'ftp://ftp.fau.de/mageia', + 'city' => 'Cologne', + 'url' => 'http://mirror.netcologne.de/mageia', ), 9 => array ( 'zone' => 'DE', 'country' => 'DE', - 'city' => 'Erlangen', - 'url' => 'http://ftp.fau.de/mageia', + 'city' => 'Düsseldorf', + 'url' => 'http://mirror.tuxinator.org/mageia', ), 10 => array ( 'zone' => 'DE', 'country' => 'DE', 'city' => 'Erlangen', - 'url' => 'https://ftp.fau.de/mageia', + 'url' => 'ftp://ftp.fau.de/mageia', ), 11 => array ( 'zone' => 'DE', 'country' => 'DE', - 'city' => 'Göttingen', - 'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia', + 'city' => 'Erlangen', + 'url' => 'http://ftp.fau.de/mageia', ), 12 => array ( 'zone' => 'DE', 'country' => 'DE', - 'city' => 'Göttingen', - 'url' => 'http://ftp5.gwdg.de/pub/linux/mageia', + 'city' => 'Erlangen', + 'url' => 'https://ftp.fau.de/mageia', ), 13 => array ( 'zone' => 'DE', 'country' => 'DE', - 'city' => 'Hermsdorf', - 'url' => 'http://mirror.tuxinator.org/mageia', + 'city' => 'Esslingen', + 'url' => 'ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia', ), 14 => array ( 'zone' => 'DE', 'country' => 'DE', - 'city' => 'freiburg', - 'url' => 'ftp://mirror2.tuxinator.org/mageia', + 'city' => 'Esslingen', + 'url' => 'http://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia', ), 15 => array ( 'zone' => 'DE', 'country' => 'DE', - 'city' => 'freiburg', - 'url' => 'http://mirror2.tuxinator.org/mageia', + 'city' => 'Esslingen', + 'url' => 'https://ftp-stud.hs-esslingen.de/pub/Mirrors/Mageia', ), 16 => + array ( + 'zone' => 'DE', + 'country' => 'DE', + 'city' => 'Falkenstein/Vogtl.', + 'url' => 'http://mirror2.tuxinator.org/mageia', + ), + 17 => + array ( + 'zone' => 'DE', + 'country' => 'DE', + 'city' => 'Göttingen', + 'url' => 'ftp://ftp5.gwdg.de/pub/linux/mageia', + ), + 18 => + array ( + 'zone' => 'DE', + 'country' => 'DE', + 'city' => 'Göttingen', + 'url' => 'http://ftp5.gwdg.de/pub/linux/mageia', + ), + 19 => + array ( + 'zone' => 'DE', + 'country' => 'DE', + 'city' => 'Göttingen', + 'url' => 'https://ftp5.gwdg.de/pub/linux/mageia', + ), + 20 => array ( 'zone' => 'DK', 'country' => 'DK', 'city' => 'DTU', 'url' => 'ftp://ftp.klid.dk/mageia', ), - 17 => + 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 => + array ( + 'zone' => 'FR', + 'country' => 'FR', + 'city' => 'Lyon', + 'url' => 'http://fr2.rpmfind.net/linux/mageia', + ), + 24 => array ( 'zone' => 'FR', 'country' => 'FR', 'city' => 'Paris', 'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia', ), - 18 => + 25 => array ( 'zone' => 'FR', 'country' => 'FR', 'city' => 'Paris', 'url' => 'ftp://ftp.free.fr/mirrors/mageia.org', ), - 19 => + 26 => array ( 'zone' => 'FR', 'country' => 'FR', 'city' => 'Paris', 'url' => 'http://aglae.biomedicale.univ-paris5.fr', ), - 20 => + 27 => array ( 'zone' => 'FR', 'country' => 'FR', 'city' => 'Paris', 'url' => 'http://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia', ), - 21 => + 28 => array ( 'zone' => 'FR', 'country' => 'FR', 'city' => 'Paris', 'url' => 'http://ftp.free.fr/mirrors/mageia.org', ), - 22 => + 29 => array ( 'zone' => 'FR', 'country' => 'FR', - 'city' => 'Rennes', + 'city' => 'Paris', 'url' => 'http://magie.remi.lu', ), - 23 => + 30 => array ( 'zone' => 'GB', 'country' => 'GB', 'city' => 'Canterbury', 'url' => 'ftp://www.mirrorservice.org/sites/mageia.org/pub/mageia', ), - 24 => + 31 => array ( 'zone' => 'GB', 'country' => 'GB', 'city' => 'Canterbury', 'url' => 'http://www.mirrorservice.org/sites/mageia.org/pub/mageia', ), - 25 => + 32 => array ( 'zone' => 'GR', 'country' => 'GR', 'city' => 'Heraklion', 'url' => 'ftp://ftp.cc.uoc.gr/mirrors/linux/mageia', ), - 26 => + 33 => array ( 'zone' => 'GR', 'country' => 'GR', 'city' => 'Heraklion', 'url' => 'http://ftp.cc.uoc.gr/mirrors/linux/mageia', ), - 27 => + 34 => + array ( + 'zone' => 'IT', + 'country' => 'IT', + 'city' => 'Milan', + 'url' => 'ftp://vodka.sublink.org/mageia', + ), + 35 => + array ( + 'zone' => 'IT', + 'country' => 'IT', + 'city' => 'Milan', + 'url' => 'http://vodka.sublink.org/mageia', + ), + 36 => + array ( + 'zone' => 'IT', + 'country' => 'IT', + 'city' => 'Roma', + 'url' => 'http://mageia.mirror.garr.it/mirrors/mageia', + ), + 37 => array ( 'zone' => 'NL', 'country' => 'NL', 'city' => 'Amsterdam', 'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia', ), - 28 => + 38 => array ( 'zone' => 'NL', 'country' => 'NL', 'city' => 'Amsterdam', 'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia', ), - 29 => + 39 => array ( 'zone' => 'NL', 'country' => 'NL', 'city' => 'Amsterdam', 'url' => 'http://mageia.mirror.triple-it.nl', ), - 30 => + 40 => array ( 'zone' => 'NL', 'country' => 'NL', 'city' => 'Enschede', 'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia', ), - 31 => + 41 => array ( 'zone' => 'NL', 'country' => 'NL', 'city' => 'Enschede', 'url' => 'http://ftp.snt.utwente.nl/pub/os/linux/mageia', ), - 32 => + 42 => array ( 'zone' => 'PL', 'country' => 'PL', 'city' => 'Krakow', 'url' => 'ftp://mirror.onet.pl/pub/mirrors/mageia', ), - 33 => + 43 => array ( 'zone' => 'PL', 'country' => 'PL', 'city' => 'Krakow', 'url' => 'http://mirror.onet.pl/pub/mirrors/mageia', ), - 34 => + 44 => + array ( + 'zone' => 'PL', + 'country' => 'PL', + 'city' => 'Warszawa', + 'url' => 'ftp://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia', + ), + 45 => + array ( + 'zone' => 'PL', + 'country' => 'PL', + 'city' => 'Warszawa', + 'url' => 'http://ftp.icm.edu.pl/pub/Linux/sunsite/distributions/mageia', + ), + 46 => array ( 'zone' => 'RU', 'country' => 'RU', 'city' => 'Moscow', 'url' => 'ftp://mirror.yandex.ru/mageia', ), - 35 => + 47 => array ( 'zone' => 'RU', 'country' => 'RU', 'city' => 'Moscow', 'url' => 'http://mirror.yandex.ru/mageia', ), - 36 => + 48 => array ( 'zone' => 'SE', 'country' => 'SE', - 'city' => 'Umeå', + 'city' => 'UmeÃ¥', 'url' => 'http://ftp.acc.umu.se/mirror/mageia', ), - 37 => + 49 => array ( 'zone' => 'UA', 'country' => 'UA', 'city' => 'Vinnytsia', 'url' => 'ftp://mageia.ip-connect.vn.ua/mirror/mageia', ), - 38 => - array ( - 'zone' => 'UA', - 'country' => 'UA', - 'city' => 'Vinnytsia', - 'url' => 'http://mageia.ip-connect.vn.ua', - ), ), '_C:NA' => array ( 0 => + array ( + 'zone' => 'CA', + 'country' => 'CA', + 'city' => 'Beauharnois', + 'url' => 'https://mirror.softiternity.com/Mageia', + ), + 1 => array ( 'zone' => 'US', 'country' => 'US', 'city' => '-', 'url' => 'http://mirrors.kernel.org/mageia', ), - 1 => + 2 => array ( 'zone' => 'US', 'country' => 'US', 'city' => 'Durham', 'url' => 'http://distro.ibiblio.org/pub/linux/distributions/mageia', ), - 2 => + 3 => array ( 'zone' => 'US', 'country' => 'US', 'city' => 'Lenoir', 'url' => 'http://mirror.dacentec.com/mageia', ), - 3 => + 4 => array ( 'zone' => 'US', 'country' => 'US', 'city' => 'Princeton', 'url' => 'http://mirror.math.princeton.edu/pub/mageia', ), - 4 => - array ( - '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', + 'url' => 'ftp://mageia.jameswhitby.net/mageia', ), 6 => array ( @@ -482,6 +559,13 @@ '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', + ), ), '_C:SA' => array ( @@ -504,14 +588,21 @@ 'zone' => 'BR', 'country' => 'BR', 'city' => 'Brasilia', - 'url' => 'ftp://mageia.fis.unb.br/linux/mageia', + 'url' => 'http://mageia.fis.unb.br', ), 3 => array ( - 'zone' => 'BR', - 'country' => 'BR', - 'city' => 'Brasilia', - 'url' => 'http://mageia.fis.unb.br', + 'zone' => 'EC', + 'country' => 'EC', + 'city' => 'Cuenca', + 'url' => 'ftp://mirror.cedia.org.ec/mageia', + ), + 4 => + array ( + 'zone' => 'EC', + 'country' => 'EC', + 'city' => 'Cuenca', + 'url' => 'http://mirror.cedia.org.ec/mageia', ), ), ); ?> -- cgit v1.2.1