Merge remote-tracking branch 'origin/github/pr/20'

[grml-mirrors.git] / Mirrors.masterlist

diff --git a/Mirrors.masterlist b/Mirrors.masterlist
index 9ada929..bfecb38 100644 (file)
--- a/Mirrors.masterlist
+++ b/Mirrors.masterlist
@@ -31,16 +31,6 @@ Location: Manassas, Virginia, PowerLoft DC
 Sponsor: LeaseWeb B.V.
 IPv6: yes
 
-Site: grml.c3sl.ufpr.br
-Type: Secondary
-Grml-http: /
-Grml-rsync: grml/
-Maintainer: Carlos Carvalho <carlos@fisica.ufpr.br>
-Country: BR Brazil
-Location: Curitiba, Paran&aacute;
-Sponsor: Center for Scientific Computing and Free Software (C3SL) http://www.c3sl.ufpr.br/
-IPv6: yes
-
 Site: mirror.lagis.at
 Type: Secondary
 Grml-http: pub/grml/
@@ -176,16 +166,6 @@ Location: Paris
 Sponsor: Lelux.fi https://lelux.fi
 IPv6: yes
 
-Site: mirror.serverion.com
-Type: Secondary
-Grml-http: grml/
-Grml-https: grml/
-Maintainer: Serverion Mirror <info@serverion.com>
-Country: NL Netherlands
-Location: The Hague
-Sponsor: Serverion https://www.serverion.com
-IPv6: yes
-
 Site: grml.ip-connect.vn.ua
 Type: Secondary
 Grml-http: /
@@ -250,3 +230,14 @@ Country: IR Iran
 Location: Iran
 Sponsor: Bardia.tech
 IPv6: yes
+
+Site: mirror.serverion.com
+Type: Secondary
+Grml-http: grml/
+Grml-ftp: grml/
+Grml-rsync: grml/
+Maintainer: Serverion.com <mirror@serverion.com>
+Country: NL Netherlands
+Location: Zoetermeer, NL
+Sponsor: Serverion B.V.
+IPv6: yes