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

[fix] kill -> stop, add indent to service check, revert incorrect logic

Browse Source
This commit is contained in:
William Wernert
2020-12-03 10:31:45 -05:00
parent 76fff28dfa
commit 2c208ec943
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
setup/so-functions
View File

@@ -259,10 +259,10 @@ check_service_status() {
systemctl status $service_name > /dev/null 2>&1 systemctl status $service_name > /dev/null 2>&1
local status=$? local status=$?
if [ $status -gt 0 ]; then if [ $status -gt 0 ]; then
echo "$service_name is not running" >> "$setup_log" 2>&1 echo " $service_name is not running" >> "$setup_log" 2>&1
return 1; return 1;
else else
echo "$service_name is running" >> "$setup_log" 2>&1 echo " $service_name is running" >> "$setup_log" 2>&1
return 0; return 0;
fi fi
@@ -1400,11 +1400,11 @@ reinstall_init() {
# Kill any salt processes (safely) # Kill any salt processes (safely)
for service in "${salt_services[@]}"; do for service in "${salt_services[@]}"; do
# Stop the service in the background so we can exit after a certain amount of time # Stop the service in the background so we can exit after a certain amount of time
systemctl kill "$service" & systemctl stop "$service" &
local pid=$! local pid=$!
local count=0 local count=0
while ! (check_service_status "$service"); do while check_service_status "$service"; do
if [[ $count -gt $service_retry_count ]]; then if [[ $count -gt $service_retry_count ]]; then
echo "Could not stop $service after 1 minute, exiting setup." echo "Could not stop $service after 1 minute, exiting setup."

8
setup/so-setup
View File

@@ -499,11 +499,11 @@ catch() {
export percentage=0 export percentage=0
set_path set_path
if [[ $is_manager && $is_airgap ]]; then if [[ $is_manager && $is_airgap ]]; then
info "Creating airgap repo" info "Creating airgap repo"
create_repo >> $setup_log 2>&1 create_repo >> $setup_log 2>&1
airgap_rules >> $setup_log 2>&1 airgap_rules >> $setup_log 2>&1
fi fi
if [[ $is_minion ]]; then if [[ $is_minion ]]; then
set_progress_str 1 'Configuring firewall' set_progress_str 1 'Configuring firewall'