aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfilip <filip.komar@gmail.com>2020-05-13 04:22:12 +0200
committerfilip <filip.komar@gmail.com>2020-05-13 04:22:12 +0200
commit48d7d39a35196560a5c3dc36987d84d1c18e6660 (patch)
tree98705f35c62c0c9cc2e58fcebc4e99e862ccff7c
parent97471e4bf4dd40a29c3bea1a11b160c73aa9c1f2 (diff)
refreshed mirrors cache list + fully named cities with additional coma in source csv
-rw-r--r--lib/cached.list.php93
-rw-r--r--lib/cached.list_doc.php86
-rw-r--r--lib/cached.list_mirrorlist.php88
3 files changed, 109 insertions, 158 deletions
diff --git a/lib/cached.list.php b/lib/cached.list.php
index 655cb99da..391de643e 100644
--- a/lib/cached.list.php
+++ b/lib/cached.list.php
@@ -36,108 +36,94 @@
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' => 'Shanghai',
'url' => 'http://ftp.sjtu.edu.cn/mageia',
),
- 5 =>
+ 3 =>
array (
'zone' => 'CN',
'country' => 'CN',
'city' => 'Shanghai',
'url' => 'https://ftp.sjtu.edu.cn/mageia',
),
- 6 =>
+ 4 =>
array (
'zone' => 'IL',
'country' => 'IL',
'city' => '-',
'url' => 'http://mirror.isoc.org.il/pub/mageia',
),
- 7 =>
+ 5 =>
array (
'zone' => 'JP',
'country' => 'JP',
'city' => 'Tsukuba',
'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
),
- 8 =>
+ 6 =>
array (
'zone' => 'PH',
'country' => 'PH',
'city' => 'Cebu',
'url' => 'ftp://mirror.rise.ph/mageia',
),
- 9 =>
+ 7 =>
array (
'zone' => 'PH',
'country' => 'PH',
'city' => 'Cebu',
'url' => 'http://mirror.rise.ph/mageia',
),
- 10 =>
+ 8 =>
array (
'zone' => 'TR',
'country' => 'TR',
'city' => 'Ankara',
'url' => 'ftp://ftp.linux.org.tr/mageia',
),
- 11 =>
+ 9 =>
array (
'zone' => 'TR',
'country' => 'TR',
'city' => 'Ankara',
'url' => 'http://ftp.linux.org.tr/mageia',
),
- 12 =>
+ 10 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'Chungli',
'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
),
- 13 =>
+ 11 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'HsinChu',
'url' => 'ftp://free.nchc.org.tw/mageia',
),
- 14 =>
+ 12 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'HsinChu',
'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
),
- 15 =>
+ 13 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'HsinChu',
'url' => 'http://free.nchc.org.tw/mageia',
),
- 16 =>
+ 14 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'Taipei',
'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
),
- 17 =>
+ 15 =>
array (
'zone' => 'TW',
'country' => 'TW',
@@ -291,43 +277,43 @@
array (
'zone' => 'DK',
'country' => 'DK',
- 'city' => 'DTU',
- 'url' => 'http://ftp.klid.dk/ftp/mageia',
+ 'city' => 'DTU, Lyngby',
+ 'url' => 'ftp://ftp.klid.dk/mageia',
),
21 =>
array (
- 'zone' => 'FR',
- 'country' => 'FR',
- 'city' => 'Lyon',
- 'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
+ 'zone' => 'DK',
+ 'country' => 'DK',
+ 'city' => 'DTU, Lyngby',
+ 'url' => 'http://ftp.klid.dk/ftp/mageia',
),
22 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Lyon',
- 'url' => 'http://fr2.rpmfind.net/linux/mageia',
+ 'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
),
23 =>
array (
'zone' => 'FR',
'country' => 'FR',
- 'city' => 'Paris',
- 'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+ 'city' => 'Lyon',
+ 'url' => 'http://fr2.rpmfind.net/linux/mageia',
),
24 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
- 'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
+ 'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
),
25 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
- 'url' => 'http://aglae.biomedicale.univ-paris5.fr',
+ 'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
),
26 =>
array (
@@ -397,35 +383,35 @@
'zone' => 'IT',
'country' => 'IT',
'city' => 'Milan',
- 'url' => 'http://vodka.sublink.org/mageia',
+ 'url' => 'ftp://vodka.sublink.org/mageia',
),
36 =>
array (
- 'zone' => 'NL',
- 'country' => 'NL',
- 'city' => 'Amsterdam',
- 'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+ 'zone' => 'IT',
+ 'country' => 'IT',
+ 'city' => 'Milan',
+ 'url' => 'http://vodka.sublink.org/mageia',
),
37 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Amsterdam',
- 'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+ 'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
),
38 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Amsterdam',
- 'url' => 'http://mageia.mirror.triple-it.nl',
+ 'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
),
39 =>
array (
'zone' => 'NL',
'country' => 'NL',
- 'city' => 'Enschede',
- 'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
+ 'city' => 'Amsterdam',
+ 'url' => 'http://mageia.mirror.triple-it.nl',
),
40 =>
array (
@@ -483,13 +469,6 @@
'city' => 'Vinnytsia',
'url' => 'http://mageia.ip-connect.vn.ua',
),
- 48 =>
- array (
- 'zone' => 'UA',
- 'country' => 'UA',
- 'city' => 'Vinnytsia',
- 'url' => 'https://mageia.ip-connect.vn.ua',
- ),
),
'_C:NA' =>
array (
@@ -518,7 +497,7 @@
array (
'zone' => 'US',
'country' => 'US',
- 'city' => 'Lenoir',
+ 'city' => 'Lenoir, NC',
'url' => 'http://mirror.dacentec.com/mageia',
),
4 =>
@@ -532,14 +511,14 @@
array (
'zone' => 'US',
'country' => 'US',
- 'city' => 'Richmond',
+ 'city' => 'Richmond, VA',
'url' => 'ftp://mageia.jameswhitby.net/mageia',
),
6 =>
array (
'zone' => 'US',
'country' => 'US',
- 'city' => 'Richmond',
+ 'city' => 'Richmond, VA',
'url' => 'http://mageia.jameswhitby.net',
),
),
diff --git a/lib/cached.list_doc.php b/lib/cached.list_doc.php
index 1bf5fb572..65e2121f9 100644
--- a/lib/cached.list_doc.php
+++ b/lib/cached.list_doc.php
@@ -36,108 +36,94 @@
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' => 'Shanghai',
'url' => 'http://ftp.sjtu.edu.cn/mageia',
),
- 5 =>
+ 3 =>
array (
'zone' => 'CN',
'country' => 'CN',
'city' => 'Shanghai',
'url' => 'https://ftp.sjtu.edu.cn/mageia',
),
- 6 =>
+ 4 =>
array (
'zone' => 'JP',
'country' => 'JP',
'city' => 'Tsukuba',
'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
),
- 7 =>
+ 5 =>
array (
'zone' => 'PH',
'country' => 'PH',
'city' => 'Cebu',
'url' => 'ftp://mirror.rise.ph/mageia',
),
- 8 =>
+ 6 =>
array (
'zone' => 'PH',
'country' => 'PH',
'city' => 'Cebu',
'url' => 'http://mirror.rise.ph/mageia',
),
- 9 =>
+ 7 =>
array (
'zone' => 'TR',
'country' => 'TR',
'city' => 'Ankara',
'url' => 'ftp://ftp.linux.org.tr/mageia',
),
- 10 =>
+ 8 =>
array (
'zone' => 'TR',
'country' => 'TR',
'city' => 'Ankara',
'url' => 'http://ftp.linux.org.tr/mageia',
),
- 11 =>
+ 9 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'Chungli',
'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
),
- 12 =>
+ 10 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'Chungli',
'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
),
- 13 =>
+ 11 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'HsinChu',
'url' => 'ftp://free.nchc.org.tw/mageia',
),
- 14 =>
+ 12 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'HsinChu',
'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
),
- 15 =>
+ 13 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'HsinChu',
'url' => 'http://free.nchc.org.tw/mageia',
),
- 16 =>
+ 14 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'Taipei',
'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
),
- 17 =>
+ 15 =>
array (
'zone' => 'TW',
'country' => 'TW',
@@ -291,43 +277,43 @@
array (
'zone' => 'DK',
'country' => 'DK',
- 'city' => 'DTU',
- 'url' => 'http://ftp.klid.dk/ftp/mageia',
+ 'city' => 'DTU, Lyngby',
+ 'url' => 'ftp://ftp.klid.dk/mageia',
),
21 =>
array (
- 'zone' => 'FR',
- 'country' => 'FR',
- 'city' => 'Lyon',
- 'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
+ 'zone' => 'DK',
+ 'country' => 'DK',
+ 'city' => 'DTU, Lyngby',
+ 'url' => 'http://ftp.klid.dk/ftp/mageia',
),
22 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Lyon',
- 'url' => 'http://fr2.rpmfind.net/linux/mageia',
+ 'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
),
23 =>
array (
'zone' => 'FR',
'country' => 'FR',
- 'city' => 'Paris',
- 'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+ 'city' => 'Lyon',
+ 'url' => 'http://fr2.rpmfind.net/linux/mageia',
),
24 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
- 'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
+ 'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
),
25 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
- 'url' => 'http://aglae.biomedicale.univ-paris5.fr',
+ 'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
),
26 =>
array (
@@ -397,35 +383,35 @@
'zone' => 'IT',
'country' => 'IT',
'city' => 'Milan',
- 'url' => 'http://vodka.sublink.org/mageia',
+ 'url' => 'ftp://vodka.sublink.org/mageia',
),
36 =>
array (
- 'zone' => 'NL',
- 'country' => 'NL',
- 'city' => 'Amsterdam',
- 'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+ 'zone' => 'IT',
+ 'country' => 'IT',
+ 'city' => 'Milan',
+ 'url' => 'http://vodka.sublink.org/mageia',
),
37 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Amsterdam',
- 'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+ 'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
),
38 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Amsterdam',
- 'url' => 'http://mageia.mirror.triple-it.nl',
+ 'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
),
39 =>
array (
'zone' => 'NL',
'country' => 'NL',
- 'city' => 'Enschede',
- 'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
+ 'city' => 'Amsterdam',
+ 'url' => 'http://mageia.mirror.triple-it.nl',
),
40 =>
array (
@@ -504,7 +490,7 @@
array (
'zone' => 'US',
'country' => 'US',
- 'city' => 'Lenoir',
+ 'city' => 'Lenoir, NC',
'url' => 'http://mirror.dacentec.com/mageia',
),
3 =>
@@ -518,14 +504,14 @@
array (
'zone' => 'US',
'country' => 'US',
- 'city' => 'Richmond',
+ 'city' => 'Richmond, VA',
'url' => 'ftp://mageia.jameswhitby.net/mageia',
),
5 =>
array (
'zone' => 'US',
'country' => 'US',
- 'city' => 'Richmond',
+ 'city' => 'Richmond, VA',
'url' => 'http://mageia.jameswhitby.net',
),
),
diff --git a/lib/cached.list_mirrorlist.php b/lib/cached.list_mirrorlist.php
index 7388d1524..de809760a 100644
--- a/lib/cached.list_mirrorlist.php
+++ b/lib/cached.list_mirrorlist.php
@@ -36,115 +36,101 @@
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' => 'Shanghai',
'url' => 'http://ftp.sjtu.edu.cn/mageia',
),
- 5 =>
+ 3 =>
array (
'zone' => 'CN',
'country' => 'CN',
'city' => 'Shanghai',
'url' => 'https://ftp.sjtu.edu.cn/mageia',
),
- 6 =>
+ 4 =>
array (
'zone' => 'IL',
'country' => 'IL',
'city' => '-',
'url' => 'http://mirror.isoc.org.il/pub/mageia',
),
- 7 =>
+ 5 =>
array (
'zone' => 'JP',
'country' => 'JP',
'city' => 'Tsukuba',
'url' => 'http://ftp.tsukuba.wide.ad.jp/Linux/mageia',
),
- 8 =>
+ 6 =>
array (
'zone' => 'PH',
'country' => 'PH',
'city' => 'Cebu',
'url' => 'ftp://mirror.rise.ph/mageia',
),
- 9 =>
+ 7 =>
array (
'zone' => 'PH',
'country' => 'PH',
'city' => 'Cebu',
'url' => 'http://mirror.rise.ph/mageia',
),
- 10 =>
+ 8 =>
array (
'zone' => 'TR',
'country' => 'TR',
'city' => 'Ankara',
'url' => 'ftp://ftp.linux.org.tr/mageia',
),
- 11 =>
+ 9 =>
array (
'zone' => 'TR',
'country' => 'TR',
'city' => 'Ankara',
'url' => 'http://ftp.linux.org.tr/mageia',
),
- 12 =>
+ 10 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'Chungli',
'url' => 'ftp://ftp.yzu.edu.tw/Linux/Mageia',
),
- 13 =>
+ 11 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'Chungli',
'url' => 'http://ftp.yzu.edu.tw/Linux/Mageia',
),
- 14 =>
+ 12 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'HsinChu',
'url' => 'ftp://free.nchc.org.tw/mageia',
),
- 15 =>
+ 13 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'HsinChu',
'url' => 'ftp://ftp.twaren.net/Linux/Mageia',
),
- 16 =>
+ 14 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'HsinChu',
'url' => 'http://free.nchc.org.tw/mageia',
),
- 17 =>
+ 15 =>
array (
'zone' => 'TW',
'country' => 'TW',
'city' => 'Taipei',
'url' => 'ftp://ftp.tku.edu.tw/Linux/Mageia',
),
- 18 =>
+ 16 =>
array (
'zone' => 'TW',
'country' => 'TW',
@@ -298,43 +284,43 @@
array (
'zone' => 'DK',
'country' => 'DK',
- 'city' => 'DTU',
- 'url' => 'http://ftp.klid.dk/ftp/mageia',
+ 'city' => 'DTU, Lyngby',
+ 'url' => 'ftp://ftp.klid.dk/mageia',
),
21 =>
array (
- 'zone' => 'FR',
- 'country' => 'FR',
- 'city' => 'Lyon',
- 'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
+ 'zone' => 'DK',
+ 'country' => 'DK',
+ 'city' => 'DTU, Lyngby',
+ 'url' => 'http://ftp.klid.dk/ftp/mageia',
),
22 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Lyon',
- 'url' => 'http://fr2.rpmfind.net/linux/mageia',
+ 'url' => 'ftp://fr2.rpmfind.net/linux/mageia',
),
23 =>
array (
'zone' => 'FR',
'country' => 'FR',
- 'city' => 'Paris',
- 'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
+ 'city' => 'Lyon',
+ 'url' => 'http://fr2.rpmfind.net/linux/mageia',
),
24 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
- 'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
+ 'url' => 'ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/Mageia',
),
25 =>
array (
'zone' => 'FR',
'country' => 'FR',
'city' => 'Paris',
- 'url' => 'http://aglae.biomedicale.univ-paris5.fr',
+ 'url' => 'ftp://ftp.free.fr/mirrors/mageia.org',
),
26 =>
array (
@@ -404,35 +390,35 @@
'zone' => 'IT',
'country' => 'IT',
'city' => 'Milan',
- 'url' => 'http://vodka.sublink.org/mageia',
+ 'url' => 'ftp://vodka.sublink.org/mageia',
),
36 =>
array (
- 'zone' => 'NL',
- 'country' => 'NL',
- 'city' => 'Amsterdam',
- 'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+ 'zone' => 'IT',
+ 'country' => 'IT',
+ 'city' => 'Milan',
+ 'url' => 'http://vodka.sublink.org/mageia',
),
37 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Amsterdam',
- 'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
+ 'url' => 'ftp://ftp.nluug.nl/pub/os/Linux/distr/mageia',
),
38 =>
array (
'zone' => 'NL',
'country' => 'NL',
'city' => 'Amsterdam',
- 'url' => 'http://mageia.mirror.triple-it.nl',
+ 'url' => 'http://ftp.nluug.nl/pub/os/Linux/distr/mageia',
),
39 =>
array (
'zone' => 'NL',
'country' => 'NL',
- 'city' => 'Enschede',
- 'url' => 'ftp://ftp.snt.utwente.nl/pub/os/linux/mageia',
+ 'city' => 'Amsterdam',
+ 'url' => 'http://mageia.mirror.triple-it.nl',
),
40 =>
array (
@@ -518,7 +504,7 @@
array (
'zone' => 'US',
'country' => 'US',
- 'city' => 'Lenoir',
+ 'city' => 'Lenoir, NC',
'url' => 'http://mirror.dacentec.com/mageia',
),
4 =>
@@ -532,14 +518,14 @@
array (
'zone' => 'US',
'country' => 'US',
- 'city' => 'Richmond',
+ 'city' => 'Richmond, VA',
'url' => 'ftp://mageia.jameswhitby.net/mageia',
),
6 =>
array (
'zone' => 'US',
'country' => 'US',
- 'city' => 'Richmond',
+ 'city' => 'Richmond, VA',
'url' => 'http://mageia.jameswhitby.net',
),
),