diff options
| author | lowkey <dvehrs@gmail.com> | 2019-09-11 19:47:28 +0300 |
|---|---|---|
| committer | lowkey <dvehrs@gmail.com> | 2019-09-11 19:47:28 +0300 |
| commit | 0fc887e830fa9b6779d1ee1129db0e8e64271e67 (patch) | |
| tree | a7f4fe60e656459e7d85dac69acc779d50814f80 /include/tests_mail_messaging | |
| parent | fbcfab1adcf9be5e034790fe60eb9a7456518ce5 (diff) | |
Removed WARNINGs from unset certificate and private key
Diffstat (limited to 'include/tests_mail_messaging')
| -rw-r--r-- | include/tests_mail_messaging | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/include/tests_mail_messaging b/include/tests_mail_messaging index 76c78dad..088ee371 100644 --- a/include/tests_mail_messaging +++ b/include/tests_mail_messaging @@ -137,28 +137,28 @@ LogText "Result: ${EXIM_CERTIFICATE}" if [ -f "${EXIM_CERTIFICATE}" ]; then Display --indent 4 --text "- Certificate" --result "${STATUS_FOUND}" --color GREEN - LogText "Result: Certificate found." + LogText "Result: Certificate found" else Display --indent 4 --text "- Certificate" --result "${STATUS_NOT_FOUND}" --color YELLOW - LogText "Result: Certificate not found." + LogText "Result: Certificate not found" fi else - LogText "Result: Certificate not set." - Display --indent 4 --text "- Certificate not set" --result "${STATUS_WARNING}" --color WHITE + LogText "Result: Certificate not set" + Display --indent 4 --text "- Certificate" --result "Not Configured" --color WHITE fi if [ -n "${EXIM_PRIVATEKEY}" ]; then LogText "Result: ${EXIM_PRIVATEKEY}" if [ -f "${EXIM_PRIVATEKEY}" ]; then - LogText "Result: Private Key found." + LogText "Result: Private Key found" Display --indent 4 --text "- Private Key" --result "${STATUS_FOUND}" --color GREEN else Display --indent 4 --text "- Private Key" --result "${STATUS_NOT_FOUND}" --color YELLOW - LogText "Result: Private Key not found." + LogText "Result: Private Key not found" fi else - LogText "Result: Private Key not set." - Display --indent 4 --text "- Private Key not set" --result "${STATUS_WARNING}" --color WHITE + LogText "Result: Private Key not set" + Display --indent 4 --text "- Private Key" --result "Not Configured" --color WHITE fi LogText "Test: Exim Verify Certificates" @@ -204,35 +204,33 @@ LogText "Test: Exim Try Verify Hosts" if [ ! -z "${EXIM_TRY_VERIFY_HOSTS}" ]; then + LogText "Result: Try Verify Hosts enabled" case "${EXIM_TYPE}" in "INTERNET HOST" ) - LogText "Result: Try Verify Hosts enabled." Display --indent 4 --text "- Try Verify Hosts" --result "ENABLED" --color GREEN ;; "SATELLITE" | "SMARTHOST" ) - LogText "Result: Try Verify Hosts." Display --indent 4 --text "- Try Verify Hosts" --result "ENABLED" --color YELLOW ;; esac else - LogText "Result: Try Verify Hosts not enabled." + LogText "Result: Try Verify Hosts not enabled" Display --indent 4 --text "- Try Verify Hosts" --result "NOT ENABLED" --color WHITE fi LogText "Test: Exim Verify Hosts" if [ ! -z "${EXIM_VERIFY_HOSTS}" ]; then + LogText "Result: Verify Hosts enabled" case "${EXIM_TYPE}" in "INTERNET HOST" ) - LogText "Result: Verify Hosts." Display --indent 4 --text "- Verify Hosts" --result "ENABLED" --color YELLOW ;; "SATELLITE" | "SMARTHOST" ) - LogText "Result: Verify Hosts." Display --indent 4 --text "- Verify Hosts" --result "ENABLED" --color GREEN ;; esac else - LogText "Result: Verify Hosts." + LogText "Result: Verify Hosts not enabled" Display --indent 4 --text "- Verify Hosts" --result "NOT ENABLED" --color WHITE fi fi |