mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-06 17:22:49 +01:00
[fix] Fail setup early if we can't determine version of manager
This commit is contained in:
@@ -1213,12 +1213,21 @@ docker_seed_registry() {
|
||||
}
|
||||
|
||||
download_repo_tarball() {
|
||||
mkdir -p /root/manager_setup/securityonion
|
||||
{
|
||||
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
|
||||
|
||||
mkdir -p /root/manager_setup
|
||||
|
||||
local manager_ver
|
||||
manager_ver=$($sshcmd -i /root/.ssh/so.key soremote@"$MSRV" cat /etc/soversion) >> "$setup_log" 2>&1
|
||||
|
||||
# Fail if we can't determine the version
|
||||
if [[ $manager_ver == '' ]]; then
|
||||
rm /root/install_opt
|
||||
local message="Could not determine the version of Security Onion running on the manager, please check your network settings."
|
||||
echo "$message" | tee -a "$setup_log"
|
||||
kill -SIGUSR1 "$(ps --pid $$ -oppid=)"; exit
|
||||
fi
|
||||
|
||||
$scpcmd -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
|
||||
if ! [ -f /root/manager_setup/"$manager_ver".tar.gz ]; then
|
||||
@@ -1228,6 +1237,7 @@ download_repo_tarball() {
|
||||
kill -SIGUSR1 "$(ps --pid $$ -oppid=)"; exit 1
|
||||
fi
|
||||
|
||||
mkdir -p /root/manager_setup/securityonion
|
||||
{
|
||||
tar -xzf /root/manager_setup/"$manager_ver".tar.gz -C /root/manager_setup/securityonion
|
||||
rm -rf /root/manager_setup/"$manager_ver".tar.gz
|
||||
|
||||
Reference in New Issue
Block a user