nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/683'

Browse Source
This commit is contained in:
Nick Mathewson 2019-02-19 11:32:33 -05:00
commit af36af1a9b
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/ticket29071 Normal file
View File

@ -0,0 +1,3 @@
o Code simplification and refactoring (shell scripts):
- Fix shellcheck warnings in nagios-check-tor-authority-cert script.
Resolves issue 29071.

10
contrib/dirauth-tools/nagios-check-tor-authority-cert
View File

@ -49,12 +49,12 @@ DIRSERVERS="$DIRSERVERS 80.190.246.100:80" # gabelmoo
DIRSERVERS="$DIRSERVERS 194.109.206.212:80" # dizum
DIRSERVERS="$DIRSERVERS 213.73.91.31:80" # dannenberg
TMPFILE="`tempfile`"
TMPFILE=$(mktemp)
trap 'rm -f "$TMPFILE"' 0
for dirserver in $DIRSERVERS; do
wget -q -O "$TMPFILE" "http://$dirserver/tor/keys/fp/$identity"
if [ "$?" = 0 ]; then
if wget -q -O "$TMPFILE" "http://$dirserver/tor/keys/fp/$identity"
then
break
else
cat /dev/null > "$TMPFILE"
@ -74,10 +74,10 @@ now=$(date +%s)
if [ "$now" -ge "$expiryunix" ]; then
echo "CRITICAL: Certificate expired $expirydate (authority $identity)."
exit 2
elif [ "$(( $now + 7*24*60*60 ))" -ge "$expiryunix" ]; then
elif [ "$(( now + 7*24*60*60 ))" -ge "$expiryunix" ]; then
echo "CRITICAL: Certificate expires $expirydate (authority $identity)."
exit 2
elif [ "$(( $now + 30*24*60*60 ))" -ge "$expiryunix" ]; then
elif [ "$(( now + 30*24*60*60 ))" -ge "$expiryunix" ]; then
echo "WARNING: Certificate expires $expirydate (authority $identity)."
exit 1
else