Optimizational function for 8.3.3 8.3.6

hardenedlinux · May 21, 2019 · eea44e5 · eea44e5
1 parent 25c083a
commit eea44e5
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/bin/hardening/8.3.3_configure_syslog-ng.sh b/bin/hardening/8.3.3_configure_syslog-ng.sh
@@ -14,17 +14,29 @@ set -u # One variable unset, it's over
 HARDENING_LEVEL=3
 
 SERVICE_NAME="syslog-ng"
+PACKAGE_R='rsyslog'
 
 # This function will be called if the script status is on enabled / audit mode
 audit () {
-    info "Ensure default and local facilities are preserved on the system"
-    info "No measure here, please review the file by yourself"
+    is_pkg_installed $PACKAGE_R
+	if [ $FNRET = 0 ]; then
+		ok "$PACKAGE_R has installed, so pass."
+		FNRET=0
+	else
+    	info "Ensure default and local facilities are preserved on the system"
+    	info "No measure here, please review the file by yourself"
+	fi
 }
 
 # This function will be called if the script status is on enabled mode
 apply () {
-    info "Ensure default and local facilities are preserved on the system"
-    info "No measure here, please review the file by yourself"
+    is_pkg_installed $PACKAGE_R
+	if [ $FNRET = 0 ]; then
+		ok "$PACKAGE_R has installed, so pass."
+	else
+    	info "Ensure default and local facilities are preserved on the system"
+    	info "No measure here, please review the file by yourself"
+	fi
 }
 
 # This function will check config parameters required

diff --git a/bin/hardening/8.3.6_remote_syslog-ng_acl.sh b/bin/hardening/8.3.6_remote_syslog-ng_acl.sh
@@ -12,15 +12,27 @@ set -e # One error, it's over
 set -u # One variable unset, it's over
 
 HARDENING_LEVEL=3
+PACKAGE_R='rsyslog'
 
 # This function will be called if the script status is on enabled / audit mode
 audit () {
-    info "Not implemented yet"
+    is_pkg_installed $PACKAGE_R
+	if [ $FNRET = 0 ]; then
+		ok "$PACKAGE_R has installed, so pass."
+		FNRET=0
+	else
+    	info "Not implemented yet"
+	fi
 }
 
 # This function will be called if the script status is on enabled mode
 apply () {
-    info "Not implemented yet"
+    is_pkg_installed $PACKAGE_R
+	if [ $FNRET = 0 ]; then
+		ok "$PACKAGE_R has installed, so pass."
+	else
+    	info "Not implemented yet"
+	fi
 }
 
 # This function will check config parameters required