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

[fix] Don't redirect entire download function to setup log

Browse Source
This commit is contained in:
William Wernert
2020-12-10 13:26:19 -05:00
parent 21e107f2e8
commit 8302119756
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
setup/so-functions
View File

@@ -521,6 +521,11 @@ check_requirements() {
compare_versions() { compare_versions() {
manager_ver=$(ssh -i /root/.ssh/so.key soremote@"$MSRV" cat /etc/soversion) manager_ver=$(ssh -i /root/.ssh/so.key soremote@"$MSRV" cat /etc/soversion)
if [[ $manager_ver == "" ]]; then
echo "Could not determine version of Security Onion running on manager $MSRV. Please check your network settings and run setup again." | tee "$setup_log"
kill -SIGUSR1 "$(ps --pid $$ -oppid=)"; exit 1
fi
[[ "$manager_ver" == "$SOVERSION" ]] [[ "$manager_ver" == "$SOVERSION" ]]
return return
} }
@@ -921,16 +926,24 @@ docker_seed_registry() {
} }
download_repo_tarball() { download_repo_tarball() {
manager_ver=$(ssh -i /root/.ssh/so.key soremote@"$MSRV" cat /etc/soversion) {
scp -i /root/.ssh/so.key soremote@"$MSRV":/opt/so/repo/"$manager_ver".tar.gz /root/manager_setup local manager_ver
manager_ver=$(ssh -i /root/.ssh/so.key soremote@"$MSRV" cat /etc/soversion)
scp -i /root/.ssh/so.key soremote@"$MSRV":/opt/so/repo/"$manager_ver".tar.gz /root/manager_setup
} >> "$setup_log" 2>&1
# Fail if the file doesn't download # Fail if the file doesn't download
if ! [ -f /root/manager_setup/"$manager_ver".tar.gz ]; then if ! [ -f /root/manager_setup/"$manager_ver".tar.gz ]; then
local message="Could not download $manager_ver.tar.gz from manager, please check your network settings and verify the file /opt/so/repo/$manager_ver.tar.gz exists on the manager."
echo "$message" | tee "$setup_log"
kill -SIGUSR1 "$(ps --pid $$ -oppid=)"; exit 1 kill -SIGUSR1 "$(ps --pid $$ -oppid=)"; exit 1
fi fi
tar -xzf /root/manager_setup/"$manager_ver".tar.gz -C /root/manager_setup/securityonion {
rm -rf /root/manager_setup/"$manager_ver".tar.gz tar -xzf /root/manager_setup/"$manager_ver".tar.gz -C /root/manager_setup/securityonion
rm -rf /root/manager_setup/"$manager_ver".tar.gz
} >> "$setup_log" 2>&1
} }
fireeye_pillar() { fireeye_pillar() {

2
setup/so-setup
View File

@@ -283,7 +283,7 @@ if ! [ -f /root/install_opt ]; then
if [[ $is_minion ]] && ! (compare_versions); then if [[ $is_minion ]] && ! (compare_versions); then
info "Installer version mismatch, downloading correct version from manager" info "Installer version mismatch, downloading correct version from manager"
echo "$install_type" > /root/install_opt echo "$install_type" > /root/install_opt
download_repo_tarball >> "$setup_log" 2>&1 download_repo_tarball
exec bash /root/manager_setup/securityonion/setup/so-setup "$@" exec bash /root/manager_setup/securityonion/setup/so-setup "$@"
fi fi