CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

start cron and enable highstate if soup exits on error

Browse Source
This commit is contained in:
m0duspwnens
2022-01-20 16:31:01 -05:00
parent e1757926cf
commit 01cb505338
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
salt/common/tools/sbin/so-common
View File

@@ -407,11 +407,16 @@ set_version() {
systemctl_func() { systemctl_func() {
local action=$1 local action=$1
local echo_action=$1
local service_name=$2 local service_name=$2
if [[ "$echo_action" == "stop" ]]; then
$echo_action = "stopp"
fi
echo "" echo ""
echo "${action^}ing $service_name service at $(date +"%T.%6N")" echo "${echo_action^}ing $service_name service at $(date +"%T.%6N")"
systemctl $action $service_name systemctl $action $service_name && echo "Successfully ${echo_action}ed $service_name." || echo "Failed to $action $service_name."
echo "" echo ""
} }

6
salt/common/tools/sbin/soup
View File

@@ -92,6 +92,10 @@ check_err() {
if [[ $exit_code -ge 64 && $exit_code -le 113 ]]; then if [[ $exit_code -ge 64 && $exit_code -le 113 ]]; then
echo "$err_msg" echo "$err_msg"
fi fi
set +e
systemctl_func "start" "$cron_service_name"
echo "Ensuring highstate is enabled."
salt-call state.enable highstate --local
exit $exit_code exit $exit_code
fi fi
@@ -954,7 +958,7 @@ fix_wazuh() {
} }
main() { main() {
trap 'trap_exit_code=$?; systemctl_func "start" "$cron_service_name"; salt-call state.enable highstate -l info --local; check_err $trap_exit_code' EXIT trap 'check_err $?' EXIT
if [ -n "$BRANCH" ]; then if [ -n "$BRANCH" ]; then
echo "SOUP will use the $BRANCH branch." echo "SOUP will use the $BRANCH branch."