Merge pull request #7 from ungleich/master

[grml-mirrors.git] / Mirrors.masterlist

diff --git a/Mirrors.masterlist b/Mirrors.masterlist
index 0a3dd28..fa0a419 100644 (file)
--- a/Mirrors.masterlist
+++ b/Mirrors.masterlist
@@ -1,26 +1,3 @@
-Site: grml.deb.at
-Type: Origin
-Grml-http: /
-Grml-rsync: grml/
-Maintainer: Gerfried Fuchs <grml@deb.at>
-Country: AT Austria
-Location: Vienna
-Sponsor: Silver Server http://www.sil.at/
-IPv6: yes
-
-Site: ftp.tw.debian.org
-Alias: debian.linux.org.tw
-Type: Secondary
-Grml-ftp: /pub/grml/
-Grml-http: /pub/grml/
-Grml-rsync: pub/grml/
-Grml-Upstream: grml.deb.at
-Maintainer: Andrew Lee <andrew@linux.org.tw>
-Country: TW Taiwan
-Location: Taipei
-Sponsor: Computer & Information Networking Center, National Taiwan University http://www.cc.ntu.edu.tw/
-IPv6: no
-
 Site: mirror.de.leaseweb.net
 Type: Secondary
 Grml-http: /grml/
@@ -43,10 +20,20 @@ Location: Haarlem, EvoSwitch DC
 Sponsor: LeaseWeb B.V.
 IPv6: yes
 
+Site: mirror.us.leaseweb.net
+Type: Secondary
+Grml-http: /grml/
+Grml-ftp: /grml/
+Grml-rsync: grml/
+Maintainer: Jeffrey Kriegsman <mirror@leaseweb.com>
+Country: US United States of America
+Location: Manassas, Virginia, PowerLoft DC
+Sponsor: LeaseWeb B.V.
+IPv6: yes
+
 Site: grml.c3sl.ufpr.br
 Type: Secondary
 Grml-http: /
-Grml-ftp: /grml/
 Grml-rsync: grml/
 Maintainer: Carlos Carvalho <carlos@fisica.ufpr.br>
 Country: BR Brazil
@@ -56,65 +43,57 @@ IPv6: yes
 
 Site: mirror.inode.at
 Type: Secondary
-Grml-http: /data/grml/
+Grml-http: /grml/
 Grml-ftp: /grml/
-Grml-rsync: mirror/grml/
-Maintainer: Michael Renner <mirror@inode.at>
+Grml-rsync: grml/
+Maintainer: mirror.inode.at team <mirror@inode.at>
 Country: AT Austria
 Location: Vienna
-Sponsor: Inode http://www.inode.at/
-IPv6: no
+Sponsor: UPC http://www.upc.at/
+IPv6: yes
 
 Site: mirror.lagis.at
 Type: Secondary
 Grml-http: /pub/grml/
 Grml-ftp: /pub/grml/
-Maintainer: ?
+Maintainer: lagis Mirror Admins <mirror@lagis.at>
 Country: AT Austria
 Location: Linz
 Sponsor: lagis Internet Service Provider GmbH http://www.lagis.at/
 IPv6: yes
 
-Site: debian.netcologne.de
+Site: mirror.netcologne.de
 Type: SecondaryPlus
-Grml-http: /www.grml.org/
-Grml-ftp: /www.grml.org/
+Grml-http: /grml/
+Grml-ftp: /grml/
+Grml-rsync: grml/
 Maintainer: Alexander Wirt <formorer@grml.org>
 Country: DE Germany
-Location: ?
+Location: Cologne
 Sponsor: NetCologne GmbH http://www.netcologne.de/
 IPv6: yes
 
-Site: ftp.uni-erlangen.de
+Site: ftp.fau.de
 Type: Secondary
-Grml-http: /pub/mirrors/grml/
-Grml-ftp: /pub/mirrors/grml/
-Maintainer: ?
+Grml-http: /grml/
+Grml-ftp: /grml/
+Maintainer: RRZE FTP-Admins <rrze-ftp-admins@fau.de>
 Country: DE Germany
 Location: Erlangen
-Sponsor: Friedrich-Alexander-Universitaet Erlangen-Nuernberg http://uni-erlangen.de/
+Sponsor: Friedrich-Alexander-Universitaet Erlangen-Nuernberg http://www.fau.de/
 IPv6: Yes
 
 Site: ftp.gwdg.de
 Type: Secondary
 Grml-http: /pub/linux/grml/
 Grml-ftp: /pub/linux/grml/
-Grml-rsync: rsync://ftp5.gwdg.de/pub/linux/grml/
+Grml-rsync: pub/linux/grml/
 Maintainer: ?
 Country: DE Germany
-Location: ?
+Location: Goettingen
 Sponsor: Gesellschaft für wissenschaftliche Datenverarbeitung mbH Göttingen http://gwdg.de/
 IPv6: no
 
-Site: storage.theta.stoerimpuls.net
-Type: Secondary
-Grml-http: /grml/
-Maintainer: ?
-Country: DE Germany
-Location: ?
-Sponsor: Stoerimpuls Networks http://stoerimpuls.net/
-IPv6: no
-
 Site: mirror.rit.edu
 Type: Secondary
 Grml-http: /grml/
@@ -129,19 +108,82 @@ Type: Secondary
 Grml-http: /grml/
 Grml-ftp: /grml/
 Grml-rsync: grml/
-Maintainer: ?
+Maintainer: Carsten Otto <ftp@halifax.rwth-aachen.de>
 Country: DE Germany
 Location: Aachen
-Sponsor: Halifax Dormitory Aachen http://www.halifax.rwth-aachen.de/
+Sponsor: RWTH Aachen University https://www.rwth-aachen.de/
+IPv6: yes
+
+Site: mirror.23media.de
+Type: Secondary
+Grml-http: /grml/
+Grml-rsync: grml/
+Maintainer: Mirror Admin <mirror@23media.de>
+Country: DE Germany
+Location: Frankfurt
+Sponsor: 23Media GmbH - http://www.23media.de
 IPv6: no
 
-Site: gd.tuwien.ac.at
+Site: debian.anexia.at
 Type: Secondary
-Grml-http: /opsys/linux/grml/
-Grml-ftp: /opsys/linux/grml/
-Grml-rsync: opsys/linux/grml/
-Maintainer: ?
+Grml-http: /grml/
+Grml-ftp: /grml/
+Grml-rsync: grml/
+Maintainer: Alexander Griesser <ag@anexia.at>
 Country: AT Austria
 Location: Vienna
-Sponsor: Technical University of Vienna http://www.tuwien.ac.at/
+Sponsor: ANEXIA http://www.anexia.at/
 IPv6: no
+
+Site: mirror.bytemark.co.uk
+Type: Secondary
+Grml-http: /grml/
+Grml-ftp: /grml/
+Grml-rsync: grml/
+Maintainer: James Lawrie <support@support.bytemark.co.uk>
+Country: GB England
+Location: York
+Sponsor: Bytemark Hosting http://www.bytemark.co.uk/
+IPv6: yes
+
+Site: grml.mirror.wearetriple.com
+Type: Secondary
+Grml-http: /
+Grml-https: /
+Grml-rsync: grml/
+Maintainer: Mirror Admin <mirror@wearetriple.com>
+Country: NL Netherlands
+Location: Amsterdam
+Sponsor: Triple https://www.wearetriple.com/
+IPv6: yes
+
+Site: mirror.koddos.net
+Type: Secondary
+Grml-http: /grml/
+Grml-https: /grml/
+Grml-rsync: grml/
+Maintainer: Mirror Admin <mirror@koddos.net>
+Country: NL Netherlands
+Location: Dronten
+Sponsor: KoDDoS https://koddos.net
+IPv6: yes
+
+Site: mirror-hk.koddos.net
+Type: Secondary
+Grml-http: /grml/
+Grml-https: /grml/
+Grml-rsync: grml/
+Maintainer: Mirror Admin <mirror@koddos.net>
+Country: HK Hong Kong
+Location: Hong Kong
+Sponsor: KoDDoS https://zh.koddos.net
+IPv6: yes
+
+Site: mirror.ungleich.ch
+Type: Secondary
+Grml-https: /mirror/grml/
+Maintainer: ungleich team <support@ungleich.ch>
+Country: Switzerland
+Location: Glarus
+Sponsor: ungleich https://ungleich.ch
+IPv6: yes