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

set_os and set_cron_service_name sooner

Browse Source
This commit is contained in:
m0duspwnens
2022-04-11 15:36:02 -04:00
parent 6ed8694008
commit 01510c184a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,7 +123,7 @@ check_elastic_license() {
check_salt_master_status() { check_salt_master_status() {
local timeout=$1 local timeout=$1
echo "Checking if we can talk to the salt master" echo "Checking if we can talk to the salt master"
salt-call state.show_top -t $timeout concurrent=true salt-call state.show_top concurrent=true
return return
} }

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

@@ -1014,7 +1014,9 @@ main() {
echo "### Preparing soup at $(date) ###" echo "### Preparing soup at $(date) ###"
echo "" echo ""
if ! check_salt_master_status 30; then set_os
set_cron_service_name
if ! check_salt_master_status; then
echo "Could not talk to salt master" echo "Could not talk to salt master"
echo "Please run `systemctl status salt-master` to ensure the salt-master service is running." echo "Please run `systemctl status salt-master` to ensure the salt-master service is running."
exit 1 exit 1
@@ -1055,8 +1057,6 @@ main() {
echo "Verifying we have the latest soup script." echo "Verifying we have the latest soup script."
verify_latest_update_script verify_latest_update_script
echo "" echo ""
set_os
set_cron_service_name
set_palette set_palette
check_elastic_license check_elastic_license
echo "" echo ""