Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/CISOfy/lynis.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormboelen <michael@cisofy.com>2014-10-14 12:40:00 +0400
committermboelen <michael@cisofy.com>2014-10-14 12:40:00 +0400
commitbd5c9ddd7bf06887fcd8c73d09591644d8cfa87f (patch)
tree563aaf2f794cfd8454dc9b06c7aad84ae9c63116
parentd6dbbeedb5b7ca985a907d5e2775f6a8128d777b (diff)
Textual improvement on screen for Apache configuration test
-rw-r--r--include/tests_webservers4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/tests_webservers b/include/tests_webservers
index ce74e24a..fc23edd3 100644
--- a/include/tests_webservers
+++ b/include/tests_webservers
@@ -86,7 +86,7 @@
Register --test-no HTTP-6624 --preqs-met ${PREQS_MET} --weight L --network NO --description "Testing main Apache configuration file"
if [ ${SKIPTEST} -eq 0 ]; then
APACHE_CONFIGFILE=""
- APACHE_TEST=`${HTTPDBINARY} -V | grep "\-D SERVER_CONFIG_FILE=" | sed 's/[ ]-D SERVER_CONFIG_FILE=//' | tr -d '"' | tr -d ' '`
+ APACHE_TEST=`${HTTPDBINARY} -V 2> /dev/null | grep "\-D SERVER_CONFIG_FILE=" | sed 's/[ ]-D SERVER_CONFIG_FILE=//' | tr -d '"' | tr -d ' '`
if [ "${APACHE_TEST}" = "" ]; then
Display --indent 6 --text "Result: Can't find the configuration file, so skipping some Apache related tests"
@@ -106,7 +106,7 @@
Display --indent 6 --text "Info: Configuration file found (${APACHE_CONFIGFILE})"
logtext "Result: Configuration file found (${APACHE_CONFIGFILE})"
else
- logtext "Exception: File or directory ${APACHE_CONFIGFILE} does not exist"
+ logtext "Result: File or directory ${APACHE_CONFIGFILE} does not exist"
Display --indent 6 --text "[Notice] possible directory/file parts found, but still unsure what the real configuration file is. Skipping some Apache related tests"
ReportException "${TEST_NO}:1" "Found some unknown directory or file references in Apache configuration"
fi