From d1ef851b9d09e9069fa43d3114ef2e9dc94dcfc8 Mon Sep 17 00:00:00 2001 From: Holger Weiss Date: Wed, 25 Dec 2024 19:45:01 +0100 Subject: Remove dead mirrors and use HTTP(S) --- bin/check-mirrors | 77 +++++++++++++++++---------------------------------- web/input/download.md | 29 +++++++++---------- 2 files changed, 38 insertions(+), 68 deletions(-) diff --git a/bin/check-mirrors b/bin/check-mirrors index 446e2fd..9048640 100755 --- a/bin/check-mirrors +++ b/bin/check-mirrors @@ -13,17 +13,16 @@ # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. mirrors=' - 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://ftp.osuosl.org/pub/monitoring-plugins/ - ftp://mirror.bytemark.co.uk/monitoring-plugins/ - ftp://mirror.is.co.za/mirror/monitoring-plugins.org/ - ftp://mirror.webtastix.net/monitoring-plugins/ - ftp://mirror.mephi.ru/nagios-plugins/ - ftp://ftp.kaist.ac.kr/nagios-plugins/ + https://ftp.fu-berlin.de/unix/network/monitoring-plugins/ + https://ftp.lysator.liu.se/pub/monitoring-plugins/ + https://ftp.belnet.be/mirror/nagios-plugins.org/ + https://ftp.cc.uoc.gr/mirrors/monitoring-plugins/ + https://mirrors.fe.up.pt/pub/monitoring-plugins/ + https://ftp2.osuosl.org/pub/monitoring-plugins/ + https://mirror.bytemark.co.uk/monitoring-plugins/ + http://mirror.mephi.ru/nagios-plugins/ + https://ftp.kaist.ac.kr/nagios-plugins/ + https://mirrors.ustc.edu.cn/monitoring-plugins/ ' # @@ -33,6 +32,8 @@ mirrors=' # # URLs: # - ftp://ftp.fu-berlin.de/unix/network/monitoring-plugins/ +# - http://ftp.fu-berlin.de/unix/network/monitoring-plugins/ +# - https://ftp.fu-berlin.de/unix/network/monitoring-plugins/ # # Features: # - IPv4 @@ -71,7 +72,8 @@ mirrors=' # # URLs: # - ftp://ftp.belnet.be/mirror/nagios-plugins.org/ -# - http://ftp.belnet.be/nagios-plugins.org/ +# - http://ftp.belnet.be/mirror/nagios-plugins.org/ +# - https://ftp.belnet.be/mirror/nagios-plugins.org/ # # Features: # - IPv4 @@ -89,9 +91,11 @@ mirrors=' # URLs: # - ftp://ftp.cc.uoc.gr/mirrors/monitoring-plugins/ # - http://ftp.cc.uoc.gr/mirrors/monitoring-plugins/ +# - https://ftp.cc.uoc.gr/mirrors/monitoring-plugins/ # # Features: # - IPv4 +# - IPv6 # - Updated daily # # Contacts: @@ -106,6 +110,7 @@ mirrors=' # URLs: # - ftp://mirrors.fe.up.pt/pub/monitoring-plugins/ # - http://mirrors.fe.up.pt/pub/monitoring-plugins/ +# - https://mirrors.fe.up.pt/pub/monitoring-plugins/ # # Features: # - IPv4 @@ -122,8 +127,8 @@ mirrors=' # UNITED STATES # # URLs: -# - ftp://ftp.osuosl.org/pub/monitoring-plugins/ -# - http://ftp.osuosl.org/pub/monitoring-plugins/ +# - http://ftp2.osuosl.org/pub/monitoring-plugins/ +# - https://ftp2.osuosl.org/pub/monitoring-plugins/ # # Features: # - IPv4 @@ -140,9 +145,8 @@ mirrors=' # UNITED KINGDOM # # URLs: -# - ftp://mirror.bytemark.co.uk/monitoring-plugins/ # - http://mirror.bytemark.co.uk/monitoring-plugins/ -# - rsync://mirror.bytemark.co.uk/monitoring-plugins/ (currently not available) +# - https://mirror.bytemark.co.uk/monitoring-plugins/ # # Features: # - IPv4 @@ -155,40 +159,6 @@ mirrors=' # Home page: # - http://www.bytemark.co.uk/ # -# SOUTH AFRICA -# -# URLs: -# - ftp://mirror.is.co.za/mirror/monitoring-plugins.org/ -# - http://mirror.is.co.za/mirror/monitoring-plugins.org/ -# - rsync://mirror.is.co.za/mirror/monitoring-plugins.org/ -# -# Features: -# - IPv4 -# - Updated twice a day -# -# Contacts: -# - Henti Smith -# -# Home page: -# - http://www.is.co.za/ -# -# NEW ZEALAND -# -# URLs: -# - ftp://mirror.webtastix.net/monitoring-plugins/ -# - http://mirror.webtastix.net/monitoring-plugins/ -# -# Features: -# - IPv4 -# - Updated hourly -# -# Contacts: -# - Mirror Admins -# - Shane Langley -# -# Home page: -# - http://www.webtastix.net/ -# # RUSSIA # # URLs: @@ -213,9 +183,11 @@ mirrors=' # URLs: # - ftp://ftp.kaist.ac.kr/nagios-plugins/ # - http://ftp.kaist.ac.kr/nagios-plugins/ +# - https://ftp.kaist.ac.kr/nagios-plugins/ # # Features: # - IPv4 +# - IPv6 # - Updated daily # # Contacts: @@ -229,6 +201,7 @@ mirrors=' # # URLs: # - http://mirrors.ustc.edu.cn/monitoring-plugins/ +# - https://mirrors.ustc.edu.cn/monitoring-plugins/ # - rsync://mirrors.ustc.edu.cn/monitoring-plugins/ # # Features: @@ -263,12 +236,12 @@ for mirror in $mirrors do url="${mirror%/}/timestamp" - if ncftpget -V -t 600 "$url" >'ftp.log' 2>&1 + if curl -fsSLO -m 600 "$url" >'http.log' 2>&1 then cmp -s 'expected' 'timestamp' \ || echo >&2 "$mirror is outdated ($(cat 'timestamp'))." else - tail -n 1 'ftp.log' >&2 + printf '%s failed: %s\n' "$mirror" "$(tail -n 1 'http.log')" >&2 fi rm -f 'timestamp' done diff --git a/web/input/download.md b/web/input/download.md index 8c77023..5c8ba25 100644 --- a/web/input/download.md +++ b/web/input/download.md @@ -18,10 +18,9 @@ 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 [Belgium][mirror-be], [China][mirror-cn], -[Germany][mirror-de], [Greece][mirror-gr], [Korea][mirror-kr], [New -Zealand][mirror-nz], [Portugal][mirror-pt], [Russia][mirror-ru], [South -Africa][mirror-za], [Sweden][mirror-se], the [UK][mirror-uk], and the -[USA][mirror-us]. +[Germany][mirror-de], [Greece][mirror-gr], [Korea][mirror-kr], +[Portugal][mirror-pt], [Russia][mirror-ru], [Sweden][mirror-se], the +[UK][mirror-uk], and the [USA][mirror-us]. ### Development Snapshot @@ -49,18 +48,16 @@ The current NagiosMIB tarball is available from here: Old versions can be found [within][mib] the [download area][download]. [announcement]: {{release_notes}} "Release Announcement" -[mirror-be]: ftp://ftp.belnet.be/mirror/nagios-plugins.org/ "FTP Mirror in Belgium" -[mirror-cn]: http://mirrors.ustc.edu.cn/monitoring-plugins/ "HTTP Mirror in China" -[mirror-de]: ftp://ftp.fu-berlin.de/unix/network/monitoring-plugins/ "FTP Mirror in Germany" -[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/nagios-plugins/ "FTP Mirror in Russia" -[mirror-za]: ftp://mirror.is.co.za/mirror/monitoring-plugins.org/ "FTP Mirror in South Africa" -[mirror-se]: ftp://ftp.lysator.liu.se/pub/monitoring-plugins/ "FTP Mirror in Sweden" -[mirror-uk]: ftp://mirror.bytemark.co.uk/monitoring-plugins/ "FTP Mirror in the United Kingdom" -[mirror-us]: ftp://ftp.osuosl.org/pub/monitoring-plugins/ "FTP Mirror in the United States" +[mirror-be]: https://ftp.belnet.be/mirror/nagios-plugins.org/ "Mirror in Belgium" +[mirror-cn]: https://mirrors.ustc.edu.cn/monitoring-plugins/ "Mirror in China" +[mirror-de]: https://ftp.fu-berlin.de/unix/network/monitoring-plugins/ "Mirror in Germany" +[mirror-gr]: https://ftp.cc.uoc.gr/mirrors/monitoring-plugins/ "Mirror in Greece" +[mirror-kr]: https://ftp.kaist.ac.kr/nagios-plugins/ "Mirror in Korea" +[mirror-pt]: https://mirrors.fe.up.pt/pub/monitoring-plugins/ "Mirror in Portugal" +[mirror-ru]: http://mirror.mephi.ru/nagios-plugins/ "Mirror in Russia" +[mirror-se]: https://ftp.lysator.liu.se/pub/monitoring-plugins/ "Mirror in Sweden" +[mirror-uk]: https://mirror.bytemark.co.uk/monitoring-plugins/ "Mirror in the United Kingdom" +[mirror-us]: https://ftp2.osuosl.org/pub/monitoring-plugins/ "Mirror in the United States" [repository]: https://github.com/monitoring-plugins/monitoring-plugins "Monitoring Plugins Git Repository" [news]: doc/news.txt "NEWS" [download]: download/ "Download Area" -- cgit v1.2.3-74-g34f1