X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=templates%2Fconfig%2Fmirrors.tmpl;h=d80342d2649ec8bc1cacf8169071a7b96a1281f1;hb=648a333fa9bee495e2a16843f3b5c61957828f11;hp=4457112ae87ab4e67d0b0b1abf11db6479007d3a;hpb=afa14abf81f4a4387a803dee29901e3704a64b11;p=deb%2Fpackages.git

diff --git a/templates/config/mirrors.tmpl b/templates/config/mirrors.tmpl
index 4457112..d80342d 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 => [
@@ -121,8 +118,10 @@ mirrors = {
 
 	amd64 => {
 		unofficial_port => {
-			url_name => 'amd64',
-			name => 'AMD64',
+			amd64 => {
+				url_name => 'amd64',
+				name => 'AMD64',
+			}
 		},
 		europa => [
 			"amd64.debian.net/debian",
@@ -142,8 +141,18 @@ mirrors = {
 
 	gnuab => {
 		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://www.debonaras.org/',
+				name => 'armel',
+			},
 		},
 		north_america => [
 			"www.gtlib.gatech.edu/pub/gnuab/debian",
@@ -160,53 +169,6 @@ mirrors = {
 			"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",
-		],
-	},
 }
 
 ports_url = 'http://www.debian.org/ports/'