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

[fix] Add conditions for commands so they're less likely to fail

Browse Source
This commit is contained in:
William Wernert
2020-11-04 14:20:26 -05:00
parent b2759c4c7c
commit 1e41b9ba31
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
setup/so-functions
View File

@@ -1410,27 +1410,37 @@ reserve_group_ids() {
} }
reinstall_init() { reinstall_init() {
local minion_config=/etc/salt/minion
info "Putting system in state to run setup again" info "Putting system in state to run setup again"
info "Some commands may fail depending on whether setup previously succeeded"
{ {
# Remove startup_states from minion config so we don't immediately highstate when salt starts back up local minion_config=/etc/salt/minion
sed -i '/startup_states/d' $minion_config
# Remove startup_states from minion config so we don't immediately highstate when salt starts back up
if [[ -f $minion_config ]] && grep -q "startup_states" $minion_config; then
sed -i '/startup_states/d' $minion_config
fi
if command -v salt-call &> /dev/null; then
# Disable schedule so highstate doesn't start running during the install # Disable schedule so highstate doesn't start running during the install
salt-call -l info schedule.disable salt-call -l info schedule.disable
# Kill any currently running salt jobs, also to prevent issues with highstate. # Kill any currently running salt jobs, also to prevent issues with highstate.
salt-call -l info saltutil.kill_all_jobs salt-call -l info saltutil.kill_all_jobs
fi
if command -v docker &> /dev/null; then
# Stop and remove all so-* containers so files can be changed with more safety # Stop and remove all so-* containers so files can be changed with more safety
docker stop $(docker ps -a -q --filter "name=so-") docker stop $(docker ps -a -q --filter "name=so-")
docker rm -f $(docker ps -a -q --filter "name=so-") docker rm -f $(docker ps -a -q --filter "name=so-")
fi
local date_string
date_string=$(date +%s)
# Backup /opt/so since we'll be rebuilding this directory during setup # Backup /opt/so since we'll be rebuilding this directory during setup
mv /opt/so "/opt/so_old_$(date +%s)" if [[ -d /opt/so ]]; then
mv /opt/so "/opt/so_old_${date_string}"
fi
# Remove container data directories # Remove container data directories
rm -rf /nsm/mysql rm -rf /nsm/mysql