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 reenable highstate on soup exit

Browse Source
This commit is contained in:
m0duspwnens
2022-01-20 15:26:03 -05:00
parent 1b860e11e7
commit e1757926cf
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -405,6 +405,16 @@ set_version() {
fi fi
} }
systemctl_func() {
local action=$1
local service_name=$2
echo ""
echo "${action^}ing $service_name service at $(date +"%T.%6N")"
systemctl $action $service_name
echo ""
}
has_uppercase() { has_uppercase() {
local string=$1 local string=$1

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

@@ -483,10 +483,7 @@ stop_salt_master() {
echo "Storing salt-master pid." echo "Storing salt-master pid."
MASTERPID=$(pgrep salt-master | head -1) MASTERPID=$(pgrep salt-master | head -1)
echo "Found salt-master PID $MASTERPID" echo "Found salt-master PID $MASTERPID"
echo "" systemctl_func "stop" "salt-master"
echo "Stopping Salt Master service at $(date +"%T.%6N")"
systemctl stop salt-master
echo ""
timeout 30 tail --pid=$MASTERPID -f /dev/null || echo "salt-master still running at $(date +"%T.%6N") after waiting 30s. We cannot kill due to systemd restart option." timeout 30 tail --pid=$MASTERPID -f /dev/null || echo "salt-master still running at $(date +"%T.%6N") after waiting 30s. We cannot kill due to systemd restart option."
} }
@@ -505,8 +502,7 @@ stop_salt_minion() {
echo "Storing salt-minion pid." echo "Storing salt-minion pid."
MINIONPID=$(pgrep salt-minion | head -1) MINIONPID=$(pgrep salt-minion | head -1)
echo "Found salt-minion PID $MINIONPID" echo "Found salt-minion PID $MINIONPID"
echo "Stopping Salt Minion service at $(date +"%T.%6N")." systemctl_func "stop" "salt-minion"
systemctl stop salt-minion
set +e set +e
timeout 30 tail --pid=$MINIONPID -f /dev/null || echo "Killing salt-minion at $(date +"%T.%6N") after waiting 30s" && pkill -9 -ef /usr/bin/salt-minion timeout 30 tail --pid=$MINIONPID -f /dev/null || echo "Killing salt-minion at $(date +"%T.%6N") after waiting 30s" && pkill -9 -ef /usr/bin/salt-minion
@@ -958,7 +954,7 @@ fix_wazuh() {
} }
main() { main() {
trap 'check_err $?' EXIT trap 'trap_exit_code=$?; systemctl_func "start" "$cron_service_name"; salt-call state.enable highstate -l info --local; check_err $trap_exit_code' EXIT
if [ -n "$BRANCH" ]; then if [ -n "$BRANCH" ]; then
echo "SOUP will use the $BRANCH branch." echo "SOUP will use the $BRANCH branch."
@@ -1033,9 +1029,7 @@ main() {
echo "Performing upgrade from Security Onion $INSTALLEDVERSION to Security Onion $NEWVERSION." echo "Performing upgrade from Security Onion $INSTALLEDVERSION to Security Onion $NEWVERSION."
echo "" echo ""
echo "Stopping $cron_service_name service at $(date +"%T.%6N")." systemctl_func "stop" "$cron_service_name"
echo ""
systemctl stop "$cron_service_name"
# update mine items prior to stopping salt-minion and salt-master # update mine items prior to stopping salt-minion and salt-master
update_salt_mine update_salt_mine
@@ -1104,9 +1098,7 @@ main() {
echo "Locking down Salt Master for upgrade at $(date +"%T.%6N")." echo "Locking down Salt Master for upgrade at $(date +"%T.%6N")."
masterlock masterlock
echo "" systemctl_func "start" "salt-master"
echo "Starting Salt Master service at $(date +"%T.%6N")."
systemctl start salt-master
# Testing that salt-master is up by checking that is it connected to itself # Testing that salt-master is up by checking that is it connected to itself
set +e set +e
@@ -1150,9 +1142,7 @@ main() {
masterunlock masterunlock
echo "" systemctl_func "start" "salt-master"
echo "Starting Salt Master service at $(date +"%T.%6N") ."
systemctl start salt-master
set +e set +e
echo "Waiting on the Salt Master service to be ready." echo "Waiting on the Salt Master service to be ready."
@@ -1207,9 +1197,6 @@ main() {
esac esac
fi fi
echo "Starting $cron_service_name service at $(date +"%T.%6N")."
systemctl start "$cron_service_name"
if [[ $NUM_MINIONS -gt 1 ]]; then if [[ $NUM_MINIONS -gt 1 ]]; then
cat << EOF cat << EOF