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

Merge pull request #10887 from Security-Onion-Solutions/soups

Browse Source 
Soup
This commit is contained in:
Mike Reeves
2023-07-31 13:10:02 -04:00
committed by GitHub
parent 635ddc9b21 e78e6b74ed
commit 069d32be1a
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
salt/manager/tools/sbin/soup
View File

@@ -346,7 +346,7 @@ clone_to_tmp() {
# Make a temp location for the files # Make a temp location for the files
mkdir -p /tmp/sogh mkdir -p /tmp/sogh
cd /tmp/sogh cd /tmp/sogh
SOUP_BRANCH="" SOUP_BRANCH="-b 2.4/main"
if [ -n "$BRANCH" ]; then if [ -n "$BRANCH" ]; then
SOUP_BRANCH="-b $BRANCH" SOUP_BRANCH="-b $BRANCH"
fi fi
@@ -391,6 +391,8 @@ preupgrade_changes() {
echo "Checking to see if changes are needed." echo "Checking to see if changes are needed."
[[ "$INSTALLEDVERSION" == 2.4.2 ]] && up_to_2.4.3 [[ "$INSTALLEDVERSION" == 2.4.2 ]] && up_to_2.4.3
[[ "$INSTALLEDVERSION" == 2.4.3]] && up_to_2.4.4
[[ "$INSTALLEDVERSION" == 2.4.4 ]] && up_to_2.4.5
true true
} }
@@ -399,6 +401,8 @@ postupgrade_changes() {
echo "Running post upgrade processes." echo "Running post upgrade processes."
[[ "$POSTVERSION" == 2.4.2 ]] && post_to_2.4.3 [[ "$POSTVERSION" == 2.4.2 ]] && post_to_2.4.3
[[ "$POSTVERSION" == 2.4.3 ]] && post_to_2.4.4
[[ "$POSTVERSION" == 2.4.4 ]] && post_to_2.4.5
true true
@@ -409,6 +413,15 @@ post_to_2.4.3() {
POSTVERSION=2.4.3 POSTVERSION=2.4.3
} }
post_to_2.4.4() {
echo "Nothing to apply"
POSTVERSION=2.4.4
}
post_to_2.4.5() {
echo "Nothing to apply"
POSTVERSION=2.4.5
}
stop_salt_master() { stop_salt_master() {
# kill all salt jobs across the grid because the hang indefinitely if they are queued and salt-master restarts # kill all salt jobs across the grid because the hang indefinitely if they are queued and salt-master restarts
@@ -455,7 +468,19 @@ stop_salt_minion() {
up_to_2.4.3() { up_to_2.4.3() {
echo "Nothing to do for 2.4.3" echo "Nothing to do for 2.4.3"
## ##
INSTALLEDVERSION=2.3.140 INSTALLEDVERSION=2.4.3
}
up_to_2.4.4() {
echo "Nothing to do for 2.4.4"
##
INSTALLEDVERSION=2.4.4
}
up_to_2.4.5() {
echo "Nothing to do for 2.4.5"
##
INSTALLEDVERSION=2.4.5
} }
verify_upgradespace() { verify_upgradespace() {