|
[-]
[+]
|
Changed |
check_ssl_cert.changes
|
|
|
|
[-]
[+]
|
Changed |
check_ssl_cert.spec
^
|
|
|
|
[-]
[+]
|
Changed |
check_ssl_cert-1.14.2.tar.bz2/ChangeLog
^
|
| @@ -1,3 +1,8 @@
+2012-07-13 Matteo Corti <matteo.corti@id.ethz.ch>
+
+ * check_ssl_cert: added the number of days from or to expiration in the
+ plugin output
+
2012-07-11 Matteo Corti <matteo.corti@id.ethz.ch>
* check_ssl_cert: fixed a bug with Perl date computation on some systems
|
|
[-]
[+]
|
Changed |
check_ssl_cert-1.14.2.tar.bz2/NEWS
^
|
| @@ -1,3 +1,5 @@
+2012-07-13 Version 1.14.2 Added the name since or to expiration in the plugin
+ output.
2012-07-11 Version 1.14.1 FIxed a bug with Perl date computation on some systems
2012-07-06 Version 1.14.0 The status now includes performance data in days until
expiration (requires perl with Date::Parse).
|
|
[-]
[+]
|
Changed |
check_ssl_cert-1.14.2.tar.bz2/VERSION
^
|
| @@ -1 +1 @@
-1.14.1
+1.14.2
|
|
[-]
[+]
|
Changed |
check_ssl_cert-1.14.2.tar.bz2/check_ssl_cert
^
|
| @@ -19,15 +19,15 @@
# enable substitution with:
# $ svn propset svn:keywords "Id Revision HeadURL Source Date"
#
-# $Id: check_ssl_cert 1308 2012-07-12 04:30:31Z corti $
-# $Revision: 1308 $
+# $Id: check_ssl_cert 1309 2012-07-18 09:31:45Z corti $
+# $Revision: 1309 $
# $HeadURL: https://svn.id.ethz.ch/nagios_plugins/check_ssl_cert/check_ssl_cert $
-# $Date: 2012-07-12 06:30:31 +0200 (Thu, 12 Jul 2012) $
+# $Date: 2012-07-18 11:31:45 +0200 (Wed, 18 Jul 2012) $
################################################################################
# Constants
-VERSION=1.14.1
+VERSION=1.14.2
SHORTNAME="SSL_CERT"
VALID_ATTRIBUTES=",startdate,enddate,subject,issuer,modulus,serial,hash,email,ocsp_uri,fingerprint,"
@@ -157,7 +157,7 @@
expect -c "set echo \"-noecho\"; set timeout $time; spawn -noecho $command; expect timeout { exit 1 } eof { exit 0 }"
if [ $? = 1 ] ; then
- critical "Timeout after $TIMEOUT seconds"
+ critical "Timeout after ${time} seconds"
fi
else
@@ -811,6 +811,21 @@
CN=${COMMON_NAME}
fi
-echo "${SHORTNAME} OK - X.509 ${SELFSIGNEDCERT}certificate for '${CN}' from '${CA_ISSUER_MATCHED}' valid until ${DATE}${PERFORMANCE_DATA}${LONG_OUTPUT}"
+if [ -n "${DAYS_VALID}" ] ; then
+ # nicer formatting
+ if [ ${DAYS_VALID} -gt 1 ] ; then
+ DAYS_VALID=" (expires in ${DAYS_VALID} days)"
+ elif [ ${DAYS_VALID} -eq 1 ] ; then
+ DAYS_VALID=" (expires tomorrow)"
+ elif [ ${DAYS_VALID} -eq 0 ] ; then
+ DAYS_VALID=" (expires today)"
+ elif [ ${DAYS_VALID} -eq -1 ] ; then
+ DAYS_VALID=" (expired yesterday)"
+ else
+ DAYS_VALID=" (expired ${DAYS_VALID} days ago)"
+ fi
+fi
+
+echo "${SHORTNAME} OK - X.509 ${SELFSIGNEDCERT}certificate for '${CN}' from '${CA_ISSUER_MATCHED}' valid until ${DATE}${DAYS_VALID}${PERFORMANCE_DATA}${LONG_OUTPUT}"
exit 0
|
|
[-]
[+]
|
Changed |
check_ssl_cert-1.14.2.tar.bz2/check_ssl_cert.1
^
|
| @@ -1,7 +1,7 @@
.\" Process this file with
.\" groff -man -Tascii foo.1
.\"
-.TH "check_ssl_cert" 1 "July, 2012" "1.14.1" "USER COMMANDS"
+.TH "check_ssl_cert" 1 "July, 2012" "1.14.2" "USER COMMANDS"
.SH NAME
check_ssl_cert \- checks the validity of X.509 certificates
.SH SYNOPSIS
|
|
[-]
[+]
|
Changed |
check_ssl_cert-1.14.2.tar.bz2/check_ssl_cert.spec
^
|
| @@ -6,7 +6,7 @@
# $Date: 2010-02-16 21:06:11 +0100 (Tue, 16 Feb 2010) $
################################################################################
-%define version 1.14.1
+%define version 1.14.2
%define release 0
%define sourcename check_ssl_cert
%define packagename nagios-plugins-check_ssl_cert
@@ -53,6 +53,9 @@
%{_mandir}/man1/%{sourcename}.1*
%changelog
+* Fri Jul 13 2012 Matteo Corti <matteo.corti@id.ethz.ch> - 1.14.2-0
+- Updated to 1.14.2
+
* Wed Jul 11 2012 Matteo Corti <matteo.corti@id.ethz.ch> - 1.14.1-0
- Updated to 1.14.1
|
