Show warning if any error happened during license check

This commit is contained in:
mboelen 2015-11-22 19:25:32 +01:00
parent ce0955d05c
commit 391f67e7c2

View File

@ -99,7 +99,7 @@ output "Settings file: ${SETTINGS_FILE}"
echo "Example: ${WHITE}config:upload_options:-k:${NORMAL}" echo "Example: ${WHITE}config:upload_options:-k:${NORMAL}"
logtext "Result: found self-signed certificate, however cURL -k option not used." logtext "Result: found self-signed certificate, however cURL -k option not used."
else else
output "${RED}Error: ${NORMAL}cURL exited with code ${EXITCODE}" echo "${RED}Upload Error: ${NORMAL}cURL exited with code ${EXITCODE}"
logtext "Result: cURL exited with code ${EXITCODE}" logtext "Result: cURL exited with code ${EXITCODE}"
fi fi
logtext "Result: quitting, can't check license" logtext "Result: quitting, can't check license"
@ -114,9 +114,9 @@ output "Settings file: ${SETTINGS_FILE}"
echo "" echo ""
echo "Possible causes and steps you can take:" echo "Possible causes and steps you can take:"
echo "- Connection with license server could not be established (try address in your web browser)" echo "- Connection with license server could not be established (try address in your web browser)"
echo "- License is expired (listed in Configuration screen)" echo "- Incorrect server has been configured in profile"
echo "- No credits left (listed in Configuration screen)" echo "- License is expired (listed in Configuration screen) or No credits left (listed in Configuration screen)"
echo "- Collector version of Lynis version outdated (upgrade to latest Lynis or Lynis Collector)" echo "- Collector version of Lynis version outdated (upgrade to latest version of Lynis and/or Lynis Collector)"
echo "" echo ""
echo "If you need support in solving this, please contact support@cisofy.com and include this screen output." echo "If you need support in solving this, please contact support@cisofy.com and include this screen output."
echo "" echo ""
@ -141,7 +141,7 @@ output "Settings file: ${SETTINGS_FILE}"
echo "Check the last section of the log file for the exact command used, for further troubleshooting" echo "Check the last section of the log file for the exact command used, for further troubleshooting"
echo "Debug:" echo "Debug:"
echo ${UPLOAD} echo ${UPLOAD}
echo "${RED}Warning${NORMAL}: cURL could not upload data. See ${LOGFILE} for details." echo "${RED}Upload Error${NORMAL}: cURL could not upload data. See ${LOGFILE} for details."
# Quit # Quit
ExitClean ExitClean
fi fi