Changing CIS_ROOT_DIR management in env in bin/hardening.sh

This commit is contained in:
Charles Herlin 2017-10-25 14:48:54 +02:00
parent d1cbe7526c
commit c70d6120f8

View File

@ -22,7 +22,7 @@ AUDIT_ALL=0
AUDIT_ALL_ENABLE_PASSED=0 AUDIT_ALL_ENABLE_PASSED=0
ALLOW_SERVICE_LIST=0 ALLOW_SERVICE_LIST=0
SET_HARDENING_LEVEL=0 SET_HARDENING_LEVEL=0
CIS_ROOT_DIR='' #CIS_ROOT_DIR=''
usage() { usage() {
cat << EOF cat << EOF
@ -136,16 +136,14 @@ while [[ $# > 0 ]]; do
done done
# Source Root Dir Parameter # Source Root Dir Parameter
if [ ! -r /etc/default/cis-hardening ]; then if [ -r /etc/default/cis-hardening ]; then
echo "There is no /etc/default/cis-hardening file, cannot source CIS_ROOT_DIR variable, aborting"
exit 128
else
. /etc/default/cis-hardening . /etc/default/cis-hardening
if [ -z $CIS_ROOT_DIR ]; then fi
echo "No CIS_ROOT_DIR variable, aborting" if [ -z "$CIS_ROOT_DIR" ]; then
exit 128 echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
fi echo "Cannot source CIS_ROOT_DIR variable, aborting."
fi exit 128
fi
[ -r $CIS_ROOT_DIR/lib/constants.sh ] && . $CIS_ROOT_DIR/lib/constants.sh [ -r $CIS_ROOT_DIR/lib/constants.sh ] && . $CIS_ROOT_DIR/lib/constants.sh
[ -r $CIS_ROOT_DIR/etc/hardening.cfg ] && . $CIS_ROOT_DIR/etc/hardening.cfg [ -r $CIS_ROOT_DIR/etc/hardening.cfg ] && . $CIS_ROOT_DIR/etc/hardening.cfg