diff options
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/build-web-site | 5 | ||||
-rwxr-xr-x | bin/check-mirrors | 91 |
2 files changed, 25 insertions, 71 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 | |||
18 | 18 | ||
19 | prefix='/home/plugins' | 19 | prefix='/home/plugins' |
20 | 20 | ||
21 | export PATH="$prefix/libexec:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin" | 21 | export PATH="$prefix/libexec:$prefix/opt/poole:$prefix/opt/poole/env/bin:/usr/local/bin:/usr/local/sbin:/bin:/sbin:/usr/bin:/usr/sbin" |
22 | 22 | ||
23 | myself=${0##*/} | 23 | myself=${0##*/} |
24 | man_source_dir="$prefix/web/work/man" | 24 | man_source_dir="$prefix/web/work/man" |
@@ -54,9 +54,8 @@ ln -s "$output_dir" "$site_work_dir/output" | |||
54 | # See http://pythonhosted.org/Markdown/extensions/ for documentation on the | 54 | # See http://pythonhosted.org/Markdown/extensions/ for documentation on the |
55 | # extensions. | 55 | # extensions. |
56 | # | 56 | # |
57 | poole --build \ | 57 | poole.py --build \ |
58 | --md-ext='extra' \ | 58 | --md-ext='extra' \ |
59 | --md-ext='headerid' \ | ||
60 | --md-ext='toc' \ | 59 | --md-ext='toc' \ |
61 | --md-ext='wikilinks' \ | 60 | --md-ext='wikilinks' \ |
62 | "$site_work_dir" | 61 | "$site_work_dir" |
diff --git a/bin/check-mirrors b/bin/check-mirrors index 446e2fd..168104f 100755 --- a/bin/check-mirrors +++ b/bin/check-mirrors | |||
@@ -13,17 +13,15 @@ | |||
13 | # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | 13 | # warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. |
14 | 14 | ||
15 | mirrors=' | 15 | mirrors=' |
16 | ftp://ftp.fu-berlin.de/unix/network/monitoring-plugins/ | 16 | https://ftp.fu-berlin.de/unix/network/monitoring-plugins/ |
17 | ftp://ftp.lysator.liu.se/pub/monitoring-plugins/ | 17 | https://ftp.lysator.liu.se/pub/monitoring-plugins/ |
18 | ftp://ftp.belnet.be/mirror/nagios-plugins.org/ | 18 | https://ftp.belnet.be/mirror/nagios-plugins.org/ |
19 | ftp://ftp.cc.uoc.gr/mirrors/monitoring-plugins/ | 19 | https://ftp.cc.uoc.gr/mirrors/monitoring-plugins/ |
20 | ftp://mirrors.fe.up.pt/pub/monitoring-plugins/ | 20 | https://mirrors.fe.up.pt/pub/monitoring-plugins/ |
21 | ftp://ftp.osuosl.org/pub/monitoring-plugins/ | 21 | https://ftp2.osuosl.org/pub/monitoring-plugins/ |
22 | ftp://mirror.bytemark.co.uk/monitoring-plugins/ | 22 | http://mirror.mephi.ru/nagios-plugins/ |
23 | ftp://mirror.is.co.za/mirror/monitoring-plugins.org/ | 23 | https://ftp.kaist.ac.kr/nagios-plugins/ |
24 | ftp://mirror.webtastix.net/monitoring-plugins/ | 24 | https://mirrors.ustc.edu.cn/monitoring-plugins/ |
25 | ftp://mirror.mephi.ru/nagios-plugins/ | ||
26 | ftp://ftp.kaist.ac.kr/nagios-plugins/ | ||
27 | ' | 25 | ' |
28 | 26 | ||
29 | # | 27 | # |
@@ -33,6 +31,8 @@ mirrors=' | |||
33 | # | 31 | # |
34 | # URLs: | 32 | # URLs: |
35 | # - ftp://ftp.fu-berlin.de/unix/network/monitoring-plugins/ | 33 | # - ftp://ftp.fu-berlin.de/unix/network/monitoring-plugins/ |
34 | # - http://ftp.fu-berlin.de/unix/network/monitoring-plugins/ | ||
35 | # - https://ftp.fu-berlin.de/unix/network/monitoring-plugins/ | ||
36 | # | 36 | # |
37 | # Features: | 37 | # Features: |
38 | # - IPv4 | 38 | # - IPv4 |
@@ -71,7 +71,8 @@ mirrors=' | |||
71 | # | 71 | # |
72 | # URLs: | 72 | # URLs: |
73 | # - ftp://ftp.belnet.be/mirror/nagios-plugins.org/ | 73 | # - ftp://ftp.belnet.be/mirror/nagios-plugins.org/ |
74 | # - http://ftp.belnet.be/nagios-plugins.org/ | 74 | # - http://ftp.belnet.be/mirror/nagios-plugins.org/ |
75 | # - https://ftp.belnet.be/mirror/nagios-plugins.org/ | ||
75 | # | 76 | # |
76 | # Features: | 77 | # Features: |
77 | # - IPv4 | 78 | # - IPv4 |
@@ -89,9 +90,11 @@ mirrors=' | |||
89 | # URLs: | 90 | # URLs: |
90 | # - ftp://ftp.cc.uoc.gr/mirrors/monitoring-plugins/ | 91 | # - ftp://ftp.cc.uoc.gr/mirrors/monitoring-plugins/ |
91 | # - http://ftp.cc.uoc.gr/mirrors/monitoring-plugins/ | 92 | # - http://ftp.cc.uoc.gr/mirrors/monitoring-plugins/ |
93 | # - https://ftp.cc.uoc.gr/mirrors/monitoring-plugins/ | ||
92 | # | 94 | # |
93 | # Features: | 95 | # Features: |
94 | # - IPv4 | 96 | # - IPv4 |
97 | # - IPv6 | ||
95 | # - Updated daily | 98 | # - Updated daily |
96 | # | 99 | # |
97 | # Contacts: | 100 | # Contacts: |
@@ -106,6 +109,7 @@ mirrors=' | |||
106 | # URLs: | 109 | # URLs: |
107 | # - ftp://mirrors.fe.up.pt/pub/monitoring-plugins/ | 110 | # - ftp://mirrors.fe.up.pt/pub/monitoring-plugins/ |
108 | # - http://mirrors.fe.up.pt/pub/monitoring-plugins/ | 111 | # - http://mirrors.fe.up.pt/pub/monitoring-plugins/ |
112 | # - https://mirrors.fe.up.pt/pub/monitoring-plugins/ | ||
109 | # | 113 | # |
110 | # Features: | 114 | # Features: |
111 | # - IPv4 | 115 | # - IPv4 |
@@ -122,8 +126,8 @@ mirrors=' | |||
122 | # UNITED STATES | 126 | # UNITED STATES |
123 | # | 127 | # |
124 | # URLs: | 128 | # URLs: |
125 | # - ftp://ftp.osuosl.org/pub/monitoring-plugins/ | 129 | # - http://ftp2.osuosl.org/pub/monitoring-plugins/ |
126 | # - http://ftp.osuosl.org/pub/monitoring-plugins/ | 130 | # - https://ftp2.osuosl.org/pub/monitoring-plugins/ |
127 | # | 131 | # |
128 | # Features: | 132 | # Features: |
129 | # - IPv4 | 133 | # - IPv4 |
@@ -137,58 +141,6 @@ mirrors=' | |||
137 | # - http://osuosl.org/ | 141 | # - http://osuosl.org/ |
138 | # | 142 | # |
139 | # | 143 | # |
140 | # UNITED KINGDOM | ||
141 | # | ||
142 | # URLs: | ||
143 | # - ftp://mirror.bytemark.co.uk/monitoring-plugins/ | ||
144 | # - http://mirror.bytemark.co.uk/monitoring-plugins/ | ||
145 | # - rsync://mirror.bytemark.co.uk/monitoring-plugins/ (currently not available) | ||
146 | # | ||
147 | # Features: | ||
148 | # - IPv4 | ||
149 | # - IPv6 | ||
150 | # - Updated twice a day | ||
151 | # | ||
152 | # Contacts: | ||
153 | # - James Lawrie <support AT support.bytemark.co.uk> | ||
154 | # | ||
155 | # Home page: | ||
156 | # - http://www.bytemark.co.uk/ | ||
157 | # | ||
158 | # SOUTH AFRICA | ||
159 | # | ||
160 | # URLs: | ||
161 | # - ftp://mirror.is.co.za/mirror/monitoring-plugins.org/ | ||
162 | # - http://mirror.is.co.za/mirror/monitoring-plugins.org/ | ||
163 | # - rsync://mirror.is.co.za/mirror/monitoring-plugins.org/ | ||
164 | # | ||
165 | # Features: | ||
166 | # - IPv4 | ||
167 | # - Updated twice a day | ||
168 | # | ||
169 | # Contacts: | ||
170 | # - Henti Smith <ftpadmin AT is.co.za> | ||
171 | # | ||
172 | # Home page: | ||
173 | # - http://www.is.co.za/ | ||
174 | # | ||
175 | # NEW ZEALAND | ||
176 | # | ||
177 | # URLs: | ||
178 | # - ftp://mirror.webtastix.net/monitoring-plugins/ | ||
179 | # - http://mirror.webtastix.net/monitoring-plugins/ | ||
180 | # | ||
181 | # Features: | ||
182 | # - IPv4 | ||
183 | # - Updated hourly | ||
184 | # | ||
185 | # Contacts: | ||
186 | # - Mirror Admins <mirrors AT webtastix.net> | ||
187 | # - Shane Langley <shane AT webtastix.net> | ||
188 | # | ||
189 | # Home page: | ||
190 | # - http://www.webtastix.net/ | ||
191 | # | ||
192 | # RUSSIA | 144 | # RUSSIA |
193 | # | 145 | # |
194 | # URLs: | 146 | # URLs: |
@@ -213,9 +165,11 @@ mirrors=' | |||
213 | # URLs: | 165 | # URLs: |
214 | # - ftp://ftp.kaist.ac.kr/nagios-plugins/ | 166 | # - ftp://ftp.kaist.ac.kr/nagios-plugins/ |
215 | # - http://ftp.kaist.ac.kr/nagios-plugins/ | 167 | # - http://ftp.kaist.ac.kr/nagios-plugins/ |
168 | # - https://ftp.kaist.ac.kr/nagios-plugins/ | ||
216 | # | 169 | # |
217 | # Features: | 170 | # Features: |
218 | # - IPv4 | 171 | # - IPv4 |
172 | # - IPv6 | ||
219 | # - Updated daily | 173 | # - Updated daily |
220 | # | 174 | # |
221 | # Contacts: | 175 | # Contacts: |
@@ -229,6 +183,7 @@ mirrors=' | |||
229 | # | 183 | # |
230 | # URLs: | 184 | # URLs: |
231 | # - http://mirrors.ustc.edu.cn/monitoring-plugins/ | 185 | # - http://mirrors.ustc.edu.cn/monitoring-plugins/ |
186 | # - https://mirrors.ustc.edu.cn/monitoring-plugins/ | ||
232 | # - rsync://mirrors.ustc.edu.cn/monitoring-plugins/ | 187 | # - rsync://mirrors.ustc.edu.cn/monitoring-plugins/ |
233 | # | 188 | # |
234 | # Features: | 189 | # Features: |
@@ -263,12 +218,12 @@ for mirror in $mirrors | |||
263 | do | 218 | do |
264 | url="${mirror%/}/timestamp" | 219 | url="${mirror%/}/timestamp" |
265 | 220 | ||
266 | if ncftpget -V -t 600 "$url" >'ftp.log' 2>&1 | 221 | if curl -fsSLO -m 600 "$url" >'http.log' 2>&1 |
267 | then | 222 | then |
268 | cmp -s 'expected' 'timestamp' \ | 223 | cmp -s 'expected' 'timestamp' \ |
269 | || echo >&2 "$mirror is outdated ($(cat 'timestamp'))." | 224 | || echo >&2 "$mirror is outdated ($(cat 'timestamp'))." |
270 | else | 225 | else |
271 | tail -n 1 'ftp.log' >&2 | 226 | printf '%s failed: %s\n' "$mirror" "$(tail -n 1 'http.log')" >&2 |
272 | fi | 227 | fi |
273 | rm -f 'timestamp' | 228 | rm -f 'timestamp' |
274 | done | 229 | done |