mirror of
https://github.com/ovh/debian-cis.git
synced 2025-07-15 13:22:18 +02:00
chore: update script related to systemctl / service
- configure_systemd-timesync.sh: use "is_service_enabled" instead of calling systemctl - disable_automounting.sh: use "manage_service" instead of "update-rc.d" - enable_auditd.sh: use "manage_service" instead of "update-rc.d" - enable_cron.sh: use "manage_service" instead of "update-rc.d" - enable_syslog-ng.sh: use "manage_service" instead of "update-rc.d"
This commit is contained in:
@ -21,8 +21,8 @@ SERVICE_NAME="systemd-timesyncd"
|
|||||||
|
|
||||||
# This function will be called if the script status is on enabled / audit mode
|
# This function will be called if the script status is on enabled / audit mode
|
||||||
audit() {
|
audit() {
|
||||||
status=$(systemctl is-enabled "$SERVICE_NAME")
|
is_service_enabled "$SERVICE_NAME"
|
||||||
if [ "$status" = "enabled" ]; then
|
if [ "$FNRET" -eq 0 ]; then
|
||||||
ok "$SERVICE_NAME is enabled"
|
ok "$SERVICE_NAME is enabled"
|
||||||
else
|
else
|
||||||
crit "$SERVICE_NAME is disabled"
|
crit "$SERVICE_NAME is disabled"
|
||||||
|
@ -36,7 +36,7 @@ apply() {
|
|||||||
is_service_enabled "$SERVICE_NAME"
|
is_service_enabled "$SERVICE_NAME"
|
||||||
if [ "$FNRET" = 0 ]; then
|
if [ "$FNRET" = 0 ]; then
|
||||||
info "Disabling $SERVICE_NAME"
|
info "Disabling $SERVICE_NAME"
|
||||||
update-rc.d "$SERVICE_NAME" remove >/dev/null 2>&1
|
manage_service disable "$SERVICE_NAME"
|
||||||
else
|
else
|
||||||
ok "$SERVICE_NAME is disabled"
|
ok "$SERVICE_NAME is disabled"
|
||||||
fi
|
fi
|
||||||
|
@ -50,8 +50,7 @@ apply() {
|
|||||||
ok "$SERVICE_NAME is enabled"
|
ok "$SERVICE_NAME is enabled"
|
||||||
else
|
else
|
||||||
warn "$SERVICE_NAME is not enabled, enabling it"
|
warn "$SERVICE_NAME is not enabled, enabling it"
|
||||||
update-rc.d "$SERVICE_NAME" remove >/dev/null 2>&1
|
manage_service enable "$SERVICE_NAME"
|
||||||
update-rc.d "$SERVICE_NAME" defaults >/dev/null 2>&1
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,8 +47,7 @@ apply() {
|
|||||||
is_service_enabled "$SERVICE_NAME"
|
is_service_enabled "$SERVICE_NAME"
|
||||||
if [ "$FNRET" != 0 ]; then
|
if [ "$FNRET" != 0 ]; then
|
||||||
info "Enabling $SERVICE_NAME"
|
info "Enabling $SERVICE_NAME"
|
||||||
update-rc.d "$SERVICE_NAME" remove >/dev/null 2>&1
|
manage_service enable "$SERVICE_NAME"
|
||||||
update-rc.d "$SERVICE_NAME" defaults >/dev/null 2>&1
|
|
||||||
else
|
else
|
||||||
ok "$SERVICE_NAME is enabled"
|
ok "$SERVICE_NAME is enabled"
|
||||||
fi
|
fi
|
||||||
|
@ -46,8 +46,7 @@ apply() {
|
|||||||
is_service_enabled "$SERVICE_NAME"
|
is_service_enabled "$SERVICE_NAME"
|
||||||
if [ "$FNRET" != 0 ]; then
|
if [ "$FNRET" != 0 ]; then
|
||||||
info "Enabling $SERVICE_NAME"
|
info "Enabling $SERVICE_NAME"
|
||||||
update-rc.d "$SERVICE_NAME" remove >/dev/null 2>&1
|
manage_service enable "$SERVICE_NAME" >/dev/null 2>&1
|
||||||
update-rc.d "$SERVICE_NAME" defaults >/dev/null 2>&1
|
|
||||||
else
|
else
|
||||||
ok "$SERVICE_NAME is enabled"
|
ok "$SERVICE_NAME is enabled"
|
||||||
fi
|
fi
|
||||||
|
@ -1,9 +1,11 @@
|
|||||||
# shellcheck shell=bash
|
# shellcheck shell=bash
|
||||||
# run-shellcheck
|
# run-shellcheck
|
||||||
test_audit() {
|
test_audit() {
|
||||||
|
describe Prepare failing test
|
||||||
|
apt remove -y auditd
|
||||||
|
|
||||||
describe Running on blank host
|
describe Running on blank host
|
||||||
register_test retvalshouldbe 0
|
register_test retvalshouldbe 1
|
||||||
dismiss_count_for_test
|
|
||||||
# shellcheck disable=2154
|
# shellcheck disable=2154
|
||||||
run blank "${CIS_CHECKS_DIR}/${script}.sh" --audit-all
|
run blank "${CIS_CHECKS_DIR}/${script}.sh" --audit-all
|
||||||
|
|
||||||
@ -12,7 +14,8 @@ test_audit() {
|
|||||||
"${CIS_CHECKS_DIR}/${script}.sh" || true
|
"${CIS_CHECKS_DIR}/${script}.sh" || true
|
||||||
|
|
||||||
describe Checking resolved state
|
describe Checking resolved state
|
||||||
register_test retvalshouldbe 0
|
# service still wont be enabled due to tests running inside a docker container
|
||||||
register_test contain "[ OK ] auditd is enabled"
|
register_test retvalshouldbe 1
|
||||||
|
register_test contain "[ OK ] auditd is installed"
|
||||||
run resolved "${CIS_CHECKS_DIR}/${script}.sh" --audit-all
|
run resolved "${CIS_CHECKS_DIR}/${script}.sh" --audit-all
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user