2 files changed, 23 insertions, 89 deletions

diff --git a/bin/build-web-site b/bin/build-web-site
index cbfc8c3..3b5e4a9 100755
--- a/bin/build-web-site
+++ b/bin/build-web-site
@@ -18,7 +18,7 @@ umask 022
 
 prefix='/home/plugins'
 
-export PATH="$prefix/libexec:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin"
+export PATH="$prefix/libexec:$prefix/opt/poole:$prefix/opt/poole/env/bin:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin"
 
 myself=${0##*/}
 man_source_dir="$prefix/web/work/man"
@@ -54,9 +54,8 @@ ln -s "$output_dir" "$site_work_dir/output"
 # See http://pythonhosted.org/Markdown/extensions/ for documentation on the
 # extensions.
 #
-poole --build                   \
+poole.py --build                \
     --md-ext='extra'            \
-    --md-ext='headerid'         \
     --md-ext='toc'              \
     --md-ext='wikilinks'        \
     "$site_work_dir"
diff --git a/bin/check-mirrors b/bin/check-mirrors
index 446e2fd..badcb83 100755
--- a/bin/check-mirrors
+++ b/bin/check-mirrors
@@ -13,17 +13,14 @@
 # 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://ftp2.osuosl.org/pub/monitoring-plugins/
+    http://mirror.mephi.ru/nagios-plugins/
+    https://ftp.kaist.ac.kr/nagios-plugins/
+    https://mirrors.ustc.edu.cn/monitoring-plugins/
 '
 
 #
@@ -33,6 +30,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 +70,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 +89,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:
@@ -101,29 +103,11 @@ mirrors='
 #   Home page:
 #   - http://www.en.uoc.gr/
 #
-# PORTUGAL
-#
-#   URLs:
-#   - ftp://mirrors.fe.up.pt/pub/monitoring-plugins/
-#   - http://mirrors.fe.up.pt/pub/monitoring-plugins/
-#
-#   Features:
-#   - IPv4
-#   - IPv6
-#   - Updated daily
-#
-#   Contacts:
-#   - Mirror Admins <mirrors AT fe.up.pt>
-#   - Filipe Carvalho <filipec AT sp.up.pt>
-#
-#   Home page:
-#   - http://www.sp.up.pt/
-#
 # 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
@@ -137,58 +121,6 @@ mirrors='
 #   - http://osuosl.org/
 #
 #
-# 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)
-#
-#   Features:
-#   - IPv4
-#   - IPv6
-#   - Updated twice a day
-#
-#   Contacts:
-#   - James Lawrie <support AT support.bytemark.co.uk>
-#
-#   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 <ftpadmin AT is.co.za>
-#
-#   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 <mirrors AT webtastix.net>
-#   - Shane Langley <shane AT webtastix.net>
-#
-#   Home page:
-#   - http://www.webtastix.net/
-#
 # RUSSIA
 #
 #   URLs:
@@ -213,9 +145,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 +163,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 +198,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