X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=templates%2Fconfig%2Fmirrors.tmpl;h=c9cc50e808ac1bd1f41c4f4ad515ed1cdd7381af;hb=febf7ebcdff31595aeb5546be8fc03816fc7a80d;hp=8842d7722e353794c2fca82b9c1d6153e75a4ead;hpb=2ec757bb58907b15c43548be5601d4f2b8c7caac;p=deb%2Fpackages.git

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index 8842d77..c9cc50e 100644
--- a/templates/config/mirrors.tmpl
+++ b/templates/config/mirrors.tmpl
@@ -13,29 +13,28 @@ mirrors = {
 	us => {
 		mirror_list => 'http://www.debian.org/mirror/list',
 		north_america => [
-			"ftp.us.debian.org/debian",
+#only amd64,i386			"ftp.us.debian.org/debian",
 			"http.us.debian.org/debian",
-			"ftp.debian.org/debian",
-#			"ftp.ca.debian.org/debian",
+#only amd64,i386			"ftp.debian.org/debian",
 			"ftp.egr.msu.edu/debian",
 			"mirrors.kernel.org/debian",
-			"archive.progeny.com/debian",
 			"debian.crosslink.net/debian",
-			"ftp-mirror.internap.com/pub/debian",
-			"ftp.cerias.purdue.edu/pub/os/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.rutgers.edu",
 			"debian.oregonstate.edu/debian",
 		],
 		europa => [
 			"ftp.de.debian.org/debian",
 			"ftp.at.debian.org/debian",
-			"ftp.bg.debian.org/debian",
+#no amd64			"ftp.bg.debian.org/debian",
+			"ftp.ch.debian.org/debian",
 			"ftp.cz.debian.org/debian",
 			"ftp.dk.debian.org/debian",
 			"ftp.ee.debian.org/debian",
+			"ftp.es.debian.org/debian",
 			"ftp.fi.debian.org/debian",
 			"ftp.fr.debian.org/debian",
 			"ftp.hr.debian.org/debian",
@@ -46,9 +45,9 @@ mirrors = {
 			"ftp.nl.debian.org/debian",
 			"ftp.no.debian.org/debian",
 			"ftp.pl.debian.org/debian",
-			"ftp.si.debian.org/debian",
-			"ftp.es.debian.org/debian",
+#only amd64,i386			"ftp.ru.debian.org/debian",
 			"ftp.se.debian.org/debian",
+#only some arches			"ftp.si.debian.org/debian",
 			"ftp.tr.debian.org/debian",
 			"ftp.uk.debian.org/debian",
 		],
@@ -63,20 +62,35 @@ mirrors = {
 		],
 		asia => [
 			"ftp.jp.debian.org/debian",
-#			"ftp.kr.debian.org/debian",
-			"linux.csie.nctu.edu.tw/debian",
+			"ftp2.jp.debian.org/debian",
+			"ftp.kr.debian.org/debian",
+#no amd64			"ftp.hk.debian.org/debian",
+			"ftp.tw.debian.org/debian",
+#only amd64,i386			"linux.csie.nctu.edu.tw/debian",
 			"debian.linux.org.tw/debian",
 			"linux.cdpa.nsysu.edu.tw/debian",
 		],
 	},
 
 	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 => {