voltron/NodeMgmt
1
1
Fork 0
Code Issues Pull Requests Releases 1 Activity

Update ssl-check.sh

Browse Source
This commit is contained in:
David Schroeder
2019-02-10 19:48:06 -06:00
parent 27392dde2d
commit 5df9d33741
1 changed files with 4 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
ssl-check.sh
View File

@@ -158,11 +158,6 @@ date2julian() {
fi fi
} }
#############################################################################
# Purpose: Convert a string month into an integer representation
# Arguments:
# $1 -> Month name (e.g., Sep)
#############################################################################
getmonth() getmonth()
{ {
case ${1} in case ${1} in
@@ -188,8 +183,7 @@ getmonth()
# $1 -> Date #1 # $1 -> Date #1
# $2 -> Date #2 # $2 -> Date #2
############################################################################# #############################################################################
date_diff() date_diff(){
{
if [ "${1}" != "" ] && [ "${2}" != "" ] if [ "${1}" != "" ] && [ "${2}" != "" ]
then then
echo $((${2} - ${1})) echo $((${2} - ${1}))
@@ -212,12 +206,7 @@ prints() {
if [ "${QUIET}" != "TRUE" ] && [ "${ISSUER}" = "TRUE" ] && [ "${VALIDATION}" != "TRUE" ] if [ "${QUIET}" != "TRUE" ] && [ "${ISSUER}" = "TRUE" ] && [ "${VALIDATION}" != "TRUE" ]
then then
MIN_DATE=$(echo $4 | ${AWK} '{ print $1, $2, $4 }') MIN_DATE=$(echo $4 | ${AWK} '{ print $1, $2, $4 }')
if [ "${NAGIOS}" == "TRUE" ] ${PRINTF} "%-35s %-17s %-8s %-11s %-4s %-30s\n" "$1:$2" "$6" "$3" "$MIN_DATE" "$5"
then
${PRINTF} "%-35s %-17s %-8s %-11s %-4s %-30s\n" "$1:$2" "$6" "$3" "$MIN_DATE" \|days="$5"
else
${PRINTF} "%-35s %-17s %-8s %-11s %-4s %-30s\n" "$1:$2" "$6" "$3" "$MIN_DATE" "$5"
fi
elif [ "${QUIET}" != "TRUE" ] && [ "${ISSUER}" = "TRUE" ] && [ "${VALIDATION}" == "TRUE" ] elif [ "${QUIET}" != "TRUE" ] && [ "${ISSUER}" = "TRUE" ] && [ "${VALIDATION}" == "TRUE" ]
then then
${PRINTF} "%-35s %-35s %-32s %-17s\n" "$1:$2" "$7" "$8" "$6" ${PRINTF} "%-35s %-35s %-32s %-17s\n" "$1:$2" "$7" "$8" "$6"
@@ -225,12 +214,7 @@ prints() {
elif [ "${QUIET}" != "TRUE" ] && [ "${VALIDATION}" != "TRUE" ] elif [ "${QUIET}" != "TRUE" ] && [ "${VALIDATION}" != "TRUE" ]
then then
MIN_DATE=$(echo $4 | ${AWK} '{ print $1, $2, $4 }') MIN_DATE=$(echo $4 | ${AWK} '{ print $1, $2, $4 }')
if [ "${NAGIOS}" == "TRUE" ] ${PRINTF} "%-47s %-12s %-12s %-4s %-30s\n" "$1:$2" "$3" "$MIN_DATE" "$5"
then
${PRINTF} "%-47s %-12s %-12s %-4s %-30s\n" "$1:$2" "$3" "$MIN_DATE" \|days="$5"
else
${PRINTF} "%-47s %-12s %-12s %-4s %-30s\n" "$1:$2" "$3" "$MIN_DATE" "$5"
fi
elif [ "${QUIET}" != "TRUE" ] && [ "${VALIDATION}" == "TRUE" ] elif [ "${QUIET}" != "TRUE" ] && [ "${VALIDATION}" == "TRUE" ]
then then
${PRINTF} "%-35s %-35s %-32s\n" "$1:$2" "$7" "$8" ${PRINTF} "%-35s %-35s %-32s\n" "$1:$2" "$7" "$8"
@@ -676,21 +660,6 @@ else
exit 1 exit 1
fi fi
### Remove the temporary files
if [ $DEBUG == 1 ]
then
echo "DEBUG: Certificate temporary file:"
cat ${CERT_TMP}
echo "DEBUG: Runtime information file:"
cat ${ERROR_TMP}
fi
rm -f ${CERT_TMP} ${ERROR_TMP} rm -f ${CERT_TMP} ${ERROR_TMP}
### Exit with a success indicator exit 0
if [ "${NAGIOS}" = "TRUE" ]
then
exit $RETCODE
else
exit 0
fi