X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=templates%2Fconfig%2Fmirrors.tmpl;h=75682137be31071dd86b6add65bde342600a0738;hp=d76074bec2a0b960337dfcdd52148bda6a780af3;hb=7d28d312cde87467f0d9e0ad7b21bfa9a387309c;hpb=109ef8d9d81f4df1183a7276373c39e5d9224301

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index d76074b..7568213 100644
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -18,12 +18,9 @@ mirrors = {
 #only amd64,i386			"ftp.debian.org/debian",
 			"ftp.egr.msu.edu/debian",
 			"mirrors.kernel.org/debian",
-			"debian.crosslink.net/debian",
 #not amd64			"ftp-mirror.internap.com/pub/debian",
 #only amd64,i386			"ftp.cerias.purdue.edu/pub/os/debian",
-			"ftp.lug.udel.edu/debian",
 			"debian.lcs.mit.edu/debian",
-			"debian.teleglobe.net",
 			"debian.oregonstate.edu/debian",
 		],
 		europa => [
@@ -73,12 +70,24 @@ mirrors = {
 	},
 
 	volatile => {
-		mirror_list => 'http://volatile.debian.net/mirrors.html',
+		mirror_list => 'http://www.debian.org/devel/debian-volatile/volatile-mirrors',
 		europa => [
 			"volatile.debian.net/debian-volatile",
 			"ftp2.de.debian.org/debian-volatile",
 			"ftp.sk.debian.org/debian-volatile",
 		],
+		north_america => [
+			"debian.domainmail.org/debian-volatile",
+		],
+		south_america => [
+			"sft.if.usp.br/debian-volatile",
+		],
+		asia => [
+			"ftp2.jp.debian.org/debian-volatile",
+		],
+		australia => [
+			"ftp.nz.debian.org/debian-volatile",
+		],
 	},
 
 	backports => {
@@ -104,95 +113,65 @@ mirrors = {
 		],
 		australia => [
 			"mirror.linux.org.au/backports.org",
+			"mirror.pacific.net.au/linux/debian-backports",
 		],
 	},
 
 	amd64 => {
+		mirror_list => 'http://amd64.debian.net/README.mirrors.html',
 		unofficial_port => {
-			url_name => 'amd64',
-			name => 'AMD64',
+			amd64 => {
+				url_name => 'amd64',
+				name => 'AMD64',
+			}
 		},
 		europa => [
 			"amd64.debian.net/debian",
 			"ftp.de.debian.org/debian-amd64/debian",
-			"bach.hpc2n.umu.se/debian-amd64/debian",
+			"ftp.es.debian.org/debian-amd64/debian",
+			"ftp.nl.debian.org/debian-amd64/debian",
+			"ftp.sk.debian.org/debian-amd64/debian",
 			"bytekeeper.as28747.net/debian-amd64/debian",
 			"mirror.switch.ch/debian-amd64/debian",
-			"ftp.nl.debian.org/debian-amd64/debian",
 		],
 		asia => [
+			"ftp.jp.debian.org/debian-amd64/debian/",
 			"hanzubon.jp/debian-amd64/debian",
 		],
 		north_america => [
 			"mirror.espri.arizona.edu/debian-amd64/debian",
+			"debian.csail.mit.edu/debian-amd64/debian",
+		],
+		australia => [
+			"public.planetmirror.com/pub/debian-amd64/debian",
 		],
 	},
 
-	kfreebsd => {
+	debports => {
+		mirror_list => 'http://wiki.debian.org/DebianPorts/Mirrors',
 		unofficial_port => {
-			url_name => 'kfreebsd-gnu',
-			name => 'GNU/kFreeBSD',
+			'kfreebsd-amd64' => {
+				url_name => 'kfreebsd-gnu',
+				name => 'GNU/kFreeBSD',
+			},
+			'kfreebsd-i386' => {
+				url_name => 'kfreebsd-gnu',
+				name => 'GNU/kFreeBSD',
+			},
+			armel => {
+				url => 'http://wiki.debian.org/ArmEabiPort',
+				name => 'armel',
+			},
 		},
 		north_america => [
 			"www.gtlib.gatech.edu/pub/gnuab/debian",
+			"www.superunprivileged.org/debian",
 		],
 		europa => [
-			# master site, aka ftp.gnuab.org
-			"kfreebsd-gnu.debian.net/debian",
+			"ftp.debian-ports.org/debian",
+			"ftp.de.debian.org/debian-ports",
+			"ftp.ch.debian.org/debian-ports",
 			"ftp.easynet.be/ftp/gnuab/debian",
-			"ftp.de.debian.org/debian-kfreebsd",
-			"ftp.sh.cvut.cz/MIRRORS/debian-non-linux",
-			"ftp.eila.jussieu.fr/pub/Debian-gnuab",
-		],
-		asia => [
-			"ftp.citkit.ru/pub/HURD/debian",
-		],
-	},
-
-	nonus => {
-		mirror_list => 'http://www.debian.org/mirror/list-non-US',
-		north_america => [
-#			"ftp.ca.debian.org/debian-non-US",
-			"debian.yorku.ca/debian/non-US",
-			"mirror.direct.ca/linux/debian-non-US",
-		],
-		europa => [
-			"non-us.debian.org/debian-non-US",
-			"ftp.de.debian.org/debian-non-US",
-			"ftp.at.debian.org/debian-non-US",
-			"ftp.bg.debian.org/debian-non-US",
-			"ftp.cz.debian.org/debian-non-US",
-			"ftp.fi.debian.org/debian-non-US",
-			"ftp.fr.debian.org/debian-non-US",
-			"ftp.hr.debian.org/debian-non-US",
-			"ftp.hu.debian.org/debian-non-US",
-			"ftp.ie.debian.org/debian-non-US",
-			"ftp.is.debian.org/debian-non-US",
-			"ftp.it.debian.org/debian-non-US",
-			"ftp.nl.debian.org/debian-non-US",
-			"ftp.no.debian.org/debian-non-US",
-			"ftp.pl.debian.org/debian/non-US",
-			"ftp.si.debian.org/debian-non-US",
-			"ftp.es.debian.org/debian-non-US",
-			"ftp.se.debian.org/debian-non-US",
-			"ftp.tr.debian.org/debian-non-US",
-			"ftp.uk.debian.org/debian/non-US",
-		],
-		australia => [
-			"ftp.au.debian.org/debian-non-US",
-			"ftp.wa.au.debian.org/debian-non-US",
-			"ftp.nz.debian.org/debian-non-US",
-		],
-		asia => [
-			"ftp.jp.debian.org/debian-non-US",
-#			"ftp.kr.debian.org/debian-non-US",
-			"linux.csie.nctu.edu.tw/debian-non-US",
-			"debian.linux.org.tw/debian-non-US",
-			"linux.cdpa.nsysu.edu.tw/debian-non-US",
-		],
-		south_america => [
-			"ftp.br.debian.org/debian-non-US",
-			"ftp.cl.debian.org/debian-non-US",
 		],
 	},
 }
@@ -200,12 +179,12 @@ mirrors = {
 ports_url = 'http://www.debian.org/ports/'
 
 continents = {
-		north_america => 'North America',
-		south_america => 'South America',
-		asia          => 'Asia',
-		australia     => 'Australia and New Zealand',
-		europa        => 'Europa',
-		africa        => 'Africa',
+		north_america => g('North America'),
+		south_america => g('South America'),
+		asia          => g('Asia'),
+		australia     => g('Australia and New Zealand'),
+		europa        => g('Europe'),
+		africa        => g('Africa'),
 	}
 
 %]