diff options
author | Michael Boelen <michael.boelen@cisofy.com> | 2017-08-08 15:52:59 +0300 |
---|---|---|
committer | Michael Boelen <michael.boelen@cisofy.com> | 2017-08-08 15:52:59 +0300 |
commit | a547953d99d09ec8e3daa6ae593b615506a565a9 (patch) | |
tree | 458b042f5cb8f167111f99e7401a28c9000465ab | |
parent | 4660362e7417fab69cf8be2a32b0c50fe4b15f83 (diff) |
Set default log directory, or allow it be set per OS
-rw-r--r-- | include/consts | 1 | ||||
-rw-r--r-- | include/osdetection | 1 | ||||
-rwxr-xr-x | lynis | 5 |
3 files changed, 5 insertions, 2 deletions
diff --git a/include/consts b/include/consts index 0ab269b6..21f3af02 100644 --- a/include/consts +++ b/include/consts @@ -130,6 +130,7 @@ unset LANG LMDBINARY="" LMDFOUND=0 LOGFILE="" + LOGDIR="" LOGTEXT=1 LSVGBINARY="" MACHINEID="" diff --git a/include/osdetection b/include/osdetection index 0ea1d8bb..0d19782e 100644 --- a/include/osdetection +++ b/include/osdetection @@ -111,6 +111,7 @@ HARDWARE=$(uname -m) FIND_BINARIES="whereis -b" SYSCTL_READKEY="" + LOGDIR="/var/adm/syslog" ;; # Linux @@ -297,9 +297,10 @@ ${NORMAL} DiscoverProfiles # Initialize and check profile file, auditor name, log file and report file + if [ -z "${LOGDIR}" ]; then LOGDIR="/var/log"; fi if [ -z "${AUDITORNAME}" ]; then AUDITORNAME="[Not Specified]"; fi - if [ -z "${LOGFILE}" ]; then LOGFILE="/var/log/lynis.log"; fi - if [ -z "${REPORTFILE}" ]; then REPORTFILE="/var/log/lynis-report.dat"; fi + if [ -z "${LOGFILE}" ]; then LOGFILE="${LOGDIR}/lynis.log"; fi + if [ -z "${REPORTFILE}" ]; then REPORTFILE="${LOGDIR}/lynis-report.dat"; fi # ################################################################################# # |