Re-add the list of FTP mirrors

All our previous FTP mirrors except for the one from China were updated
to mirror rsync.monitoring-plugins.org.

2 files changed, 37 insertions, 60 deletions

diff --git a/bin/check-mirrors b/bin/check-mirrors
index eaeb8d3..c521300 100755
--- a/bin/check-mirrors
+++ b/bin/check-mirrors
@@ -12,25 +12,19 @@
 # ANY WARRANTY, to the extent permitted by law; without even the implied
 # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-#mirrors='
-#    ftp://ftp.fu-berlin.de/unix/network/nagios-plugins/
-#    ftp://ftp.lysator.liu.se/pub/nagios-plugins/
-#    ftp://ftp.belnet.be/mirror/nagios-plugins.org/
-#    ftp://ftp.cc.uoc.gr/mirrors/nagios/nagios-plugins/
-#    ftp://mirrors.fe.up.pt/pub/nagios-plugins/
-#    ftp://mirror.switch.ch/mirror/nagios-plugins/
-#    ftp://mirror.bytemark.co.uk/nagios-plugins/
-#    ftp://mirror.jmu.edu/pub/nagios-plugins/
-#    ftp://mirror.fcaglp.unlp.edu.ar/nagios/plugins/
-#    ftp://mirror.webtastix.net/nagios-plugins/
-#    ftp://mirror.mephi.ru/nagios-plugins/
-#    ftp://mirrors.ustc.edu.cn/nagios-plugins/
-#    ftp://ftp.kaist.ac.kr/nagios-plugins/
-#'
-
 mirrors='
-    ftp://ftp.fu-berlin.de/unix/network/nagios-plugins/
-    ftp://mirror.switch.ch/mirror/nagios-plugins/
+    ftp://ftp.fu-berlin.de/unix/network/monitoring-plugins/
+    ftp://ftp.lysator.liu.se/pub/monitoring-plugins/
+    ftp://ftp.belnet.be/mirror/nagios-plugins.org/
+    ftp://ftp.cc.uoc.gr/mirrors/monitoring-plugins/
+    ftp://mirrors.fe.up.pt/pub/monitoring-plugins/
+    ftp://mirror.switch.ch/mirror/monitoring-plugins/
+    ftp://mirror.bytemark.co.uk/monitoring-plugins/
+    ftp://mirror.jmu.edu/pub/monitoring-plugins/
+    ftp://mirror.fcaglp.unlp.edu.ar/nagios/plugins/
+    ftp://mirror.webtastix.net/monitoring-plugins/
+    ftp://mirror.mephi.ru/nagios-plugins/
+    ftp://ftp.kaist.ac.kr/nagios-plugins/
 '
 
 #
@@ -56,10 +50,10 @@ mirrors='
 # SWEDEN
 #
 #   URLs:
-#   - ftp://ftp.lysator.liu.se/pub/nagios-plugins/
-#   - http://ftp.lysator.liu.se/pub/nagios-plugins/
-#   - https://ftp.lysator.liu.se/pub/nagios-plugins/
-#   - rsync://ftp.lysator.liu.se/pub/nagios-plugins/
+#   - ftp://ftp.lysator.liu.se/pub/monitoring-plugins/
+#   - http://ftp.lysator.liu.se/pub/monitoring-plugins/
+#   - https://ftp.lysator.liu.se/pub/monitoring-plugins/
+#   - rsync://ftp.lysator.liu.se/pub/monitoring-plugins/
 #
 #   Features:
 #   - IPv4
@@ -94,8 +88,8 @@ mirrors='
 # GREECE
 #
 #   URLs:
-#   - ftp://ftp.cc.uoc.gr/mirrors/nagios/nagios-plugins/
-#   - http://ftp.cc.uoc.gr/mirrors/nagios/nagios-plugins/
+#   - ftp://ftp.cc.uoc.gr/mirrors/monitoring-plugins/
+#   - http://ftp.cc.uoc.gr/mirrors/monitoring-plugins/
 #
 #   Features:
 #   - IPv4
@@ -111,8 +105,8 @@ mirrors='
 # PORTUGAL
 #
 #   URLs:
-#   - ftp://mirrors.fe.up.pt/pub/nagios-plugins/
-#   - http://mirrors.fe.up.pt/pub/nagios-plugins/
+#   - ftp://mirrors.fe.up.pt/pub/monitoring-plugins/
+#   - http://mirrors.fe.up.pt/pub/monitoring-plugins/
 #
 #   Features:
 #   - IPv4
@@ -146,9 +140,9 @@ mirrors='
 # UNITED KINGDOM
 #
 #   URLs:
-#   - ftp://mirror.bytemark.co.uk/nagios-plugins/
-#   - http://mirror.bytemark.co.uk/nagios-plugins/
-#   - rsync://mirror.bytemark.co.uk/nagios-plugins/ (currently not available)
+#   - ftp://mirror.bytemark.co.uk/monitoring-plugins/
+#   - http://mirror.bytemark.co.uk/monitoring-plugins/
+#   - rsync://mirror.bytemark.co.uk/monitoring-plugins/ (currently not available)
 #
 #   Features:
 #   - IPv4
@@ -164,9 +158,9 @@ mirrors='
 # UNITED STATES
 #
 #   URLs:
-#   - ftp://mirror.jmu.edu/pub/nagios-plugins/
-#   - http://mirror.jmu.edu/pub/nagios-plugins/
-#   - rsync://mirror.jmu.edu/pub/nagios-plugins/
+#   - ftp://mirror.jmu.edu/pub/monitoring-plugins/
+#   - http://mirror.jmu.edu/pub/monitoring-plugins/
+#   - rsync://mirror.jmu.edu/pub/monitoring-plugins/
 #
 #   Features:
 #   - IPv4
@@ -199,8 +193,8 @@ mirrors='
 # NEW ZEALAND
 #
 #   URLs:
-#   - ftp://mirror.webtastix.net/nagios-plugins/
-#   - http://mirror.webtastix.net/nagios-plugins/
+#   - ftp://mirror.webtastix.net/monitoring-plugins/
+#   - http://mirror.webtastix.net/monitoring-plugins/
 #
 #   Features:
 #   - IPv4
@@ -232,25 +226,6 @@ mirrors='
 #   Home page:
 #   - http://eng.mephi.ru/
 #
-# CHINA
-#
-#   URLs:
-#   - ftp://mirrors.ustc.edu.cn/nagios-plugins/
-#   - http://mirrors.ustc.edu.cn/nagios-plugins/
-#   - rsync://mirrors.ustc.edu.cn/nagios-plugins/
-#
-#   Features:
-#   - IPv4
-#   - IPv6
-#   - Updated twice a day
-#
-#   Contacts:
-#   - Mirror Admins <lug AT ustc.edu.cn>
-#   - Roy Zhang <pudh4418 AT gmail.com>
-#
-#   Home page:
-#   - http://lug.ustc.edu.cn/
-#
 # KOREA
 #
 #   URLs:
diff --git a/web/input/download.md b/web/input/download.md
index 7a85982..cdf6682 100644
--- a/web/input/download.md
+++ b/web/input/download.md
@@ -17,8 +17,11 @@ from here:
 
 See the [release history][news] for an overview of changes between earlier
 versions.  Old releases can be found in the [download area][download].  There
-are FTP mirrors available in [Germany][mirror-de] and
-[Switzerland][mirror-ch].
+are FTP mirrors available in [Argentina][mirror-ar], [Belgium][mirror-be],
+[Germany][mirror-de], [Greece][mirror-gr], [Korea][mirror-kr], [New
+Zealand][mirror-nz], [Portugal][mirror-pt], [Russia][mirror-ru],
+[Sweden][mirror-se], [Switzerland][mirror-ch], the [UK][mirror-uk], and the
+[USA][mirror-us].
 
 ### Development Snapshot
 
@@ -47,14 +50,13 @@ Old versions can be found [within][mib] the [download area][download].
 
 [announcement]: {{release_notes}} "Release Announcement"
 [mirror-ar]: ftp://mirror.fcaglp.unlp.edu.ar/nagios/plugins/ "FTP Mirror in Argentina"
-[mirror-be]: ftp://ftp.belnet.be/mirror/monitoring-plugins.org/ "FTP Mirror in Belgium"
-[mirror-cn]: ftp://mirrors.ustc.edu.cn/monitoring-plugins/ "FTP Mirror in China"
+[mirror-be]: ftp://ftp.belnet.be/mirror/nagios-plugins.org/ "FTP Mirror in Belgium"
 [mirror-de]: ftp://ftp.fu-berlin.de/unix/network/monitoring-plugins/ "FTP Mirror in Germany"
-[mirror-gr]: ftp://ftp.cc.uoc.gr/mirrors/nagios/monitoring-plugins/ "FTP Mirror in Greece"
-[mirror-kr]: ftp://ftp.kaist.ac.kr/monitoring-plugins/ "FTP Mirror in Korea"
+[mirror-gr]: ftp://ftp.cc.uoc.gr/mirrors/monitoring-plugins/ "FTP Mirror in Greece"
+[mirror-kr]: ftp://ftp.kaist.ac.kr/nagios-plugins/ "FTP Mirror in Korea"
 [mirror-nz]: ftp://mirror.webtastix.net/monitoring-plugins/ "FTP Mirror in New Zealand"
 [mirror-pt]: ftp://mirrors.fe.up.pt/pub/monitoring-plugins/ "FTP Mirror in Portugal"
-[mirror-ru]: ftp://mirror.mephi.ru/monitoring-plugins/ "FTP Mirror in Russia"
+[mirror-ru]: ftp://mirror.mephi.ru/nagios-plugins/ "FTP Mirror in Russia"
 [mirror-se]: ftp://ftp.lysator.liu.se/pub/monitoring-plugins/ "FTP Mirror in Sweden"
 [mirror-ch]: ftp://mirror.switch.ch/mirror/monitoring-plugins/ "FTP Mirror in Switzerland"
 [mirror-uk]: ftp://mirror.bytemark.co.uk/monitoring-plugins/ "FTP Mirror in the United Kingdom"