From 258da6b4a1435fff93ecc1cd15440a29d60e0ab6 Mon Sep 17 00:00:00 2001
From: Thibault Ayanides <thibault.ayanides@ovhcloud.com>
Date: Fri, 30 Oct 2020 14:40:48 +0100
Subject: [PATCH] CLEAN(4.2.2): delete 4.2.2, duplicate with 4.2.3

---
 bin/hardening/4.2.2_install_syslog-ng.sh   | 62 ----------------------
 bin/hardening/4.2.3_install_syslog-ng.sh   |  1 +
 tests/hardening/4.2.2_install_syslog-ng.sh | 10 ----
 3 files changed, 1 insertion(+), 72 deletions(-)
 delete mode 100755 bin/hardening/4.2.2_install_syslog-ng.sh
 delete mode 100644 tests/hardening/4.2.2_install_syslog-ng.sh

diff --git a/bin/hardening/4.2.2_install_syslog-ng.sh b/bin/hardening/4.2.2_install_syslog-ng.sh
deleted file mode 100755
index 4d8295a..0000000
--- a/bin/hardening/4.2.2_install_syslog-ng.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-#
-# CIS Debian Hardening
-#
-
-#
-# 4.2.2 Install the syslog-ng package (Scored)
-#
-
-set -e # One error, it's over
-set -u # One variable unset, it's over
-
-HARDENING_LEVEL=3
-DESCRIPTION="Install syslog-ng package."
-
-# NB : in CIS, rsyslog has been chosen, however we chose syslog-ng
-PACKAGE='syslog-ng'
-
-# This function will be called if the script status is on enabled / audit mode
-audit () {
-    is_pkg_installed $PACKAGE
-    if [ $FNRET != 0 ]; then
-        crit "$PACKAGE is not installed!"
-    else
-        ok "$PACKAGE is installed"
-    fi
-}
-
-# This function will be called if the script status is on enabled mode
-apply () {
-        is_pkg_installed $PACKAGE
-        if [ $FNRET = 0 ]; then
-            ok "$PACKAGE is installed"
-        else
-            crit "$PACKAGE is absent, installing it"
-            apt_install $PACKAGE
-        fi
-}
-
-# This function will check config parameters required
-check_config() {
-    :
-}
-
-# Source Root Dir Parameter
-if [ -r /etc/default/cis-hardening ]; then
-    . /etc/default/cis-hardening
-fi
-if [ -z "$CIS_ROOT_DIR" ]; then
-     echo "There is no /etc/default/cis-hardening file nor cis-hardening directory in current environment."
-     echo "Cannot source CIS_ROOT_DIR variable, aborting."
-    exit 128
-fi
-
-# Main function, will call the proper functions given the configuration (audit, enabled, disabled)
-if [ -r $CIS_ROOT_DIR/lib/main.sh ]; then
-    . $CIS_ROOT_DIR/lib/main.sh
-else
-    echo "Cannot find main.sh, have you correctly defined your root directory? Current value is $CIS_ROOT_DIR in /etc/default/cis-hardening"
-    exit 128
-fi
diff --git a/bin/hardening/4.2.3_install_syslog-ng.sh b/bin/hardening/4.2.3_install_syslog-ng.sh
index 66b80fe..70436ea 100755
--- a/bin/hardening/4.2.3_install_syslog-ng.sh
+++ b/bin/hardening/4.2.3_install_syslog-ng.sh
@@ -14,6 +14,7 @@ set -u # One variable unset, it's over
 HARDENING_LEVEL=3
 DESCRIPTION="Install syslog-ng to manage logs"
 
+# NB : in CIS, rsyslog has been chosen, however we chose syslog-ng
 PACKAGE='syslog-ng'
 
 # This function will be called if the script status is on enabled / audit mode
diff --git a/tests/hardening/4.2.2_install_syslog-ng.sh b/tests/hardening/4.2.2_install_syslog-ng.sh
deleted file mode 100644
index b333419..0000000
--- a/tests/hardening/4.2.2_install_syslog-ng.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-# run-shellcheck
-test_audit() {
-    describe Running on blank host
-    register_test retvalshouldbe 0
-    dismiss_count_for_test
-    # shellcheck disable=2154
-    run blank /opt/debian-cis/bin/hardening/"${script}".sh --audit-all
-
-    # TODO fill comprehensive tests
-}