Skip to content

Commit

Permalink
Merge pull request #11749 from Security-Onion-Solutions/TOoSmOotH-pat…
Browse files Browse the repository at this point in the history
…ch-6

Update soup
  • Loading branch information
TOoSmOotH authored Nov 9, 2023
2 parents ac44289 + 07df045 commit e321aa5
Showing 1 changed file with 19 additions and 1 deletion.
20 changes: 19 additions & 1 deletion salt/common/tools/sbin/soup
Original file line number Diff line number Diff line change
Expand Up @@ -580,6 +580,7 @@ preupgrade_changes() {
[[ "$INSTALLEDVERSION" == 2.3.240 ]] && up_to_2.3.250
[[ "$INSTALLEDVERSION" == 2.3.250 ]] && up_to_2.3.260
[[ "$INSTALLEDVERSION" == 2.3.260 ]] && up_to_2.3.270
[[ "$INSTALLEDVERSION" == 2.3.270 ]] && up_to_2.3.280

true
}
Expand Down Expand Up @@ -612,6 +613,7 @@ postupgrade_changes() {
[[ "$POSTVERSION" == 2.3.240 ]] && post_to_2.3.250
[[ "$POSTVERSION" == 2.3.250 ]] && post_to_2.3.260
[[ "$POSTVERSION" == 2.3.260 ]] && post_to_2.3.270
[[ "$POSTVERSION" == 2.3.270 ]] && post_to_2.3.280

true
}
Expand Down Expand Up @@ -772,6 +774,13 @@ post_to_2.3.270() {
POSTVERSION=2.3.270
}

post_to_2.3.280() {
echo "Nothing to do for .280
POSTVERSION=2.3.280
}
stop_salt_master() {
# kill all salt jobs across the grid because the hang indefinitely if they are queued and salt-master restarts
set +e
Expand Down Expand Up @@ -1137,6 +1146,11 @@ up_to_2.3.270() {
INSTALLEDVERSION=2.3.270
}
up_to_2.3.280() {
echo "Upgrading to 2.3.280"
INSTALLEDVERSION=2.3.280
}
verify_upgradespace() {
CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}' | sed 's/.$//')
if [ "$CURRENTSPACE" -lt "10" ]; then
Expand Down Expand Up @@ -1720,8 +1734,12 @@ if [[ -z $UNATTENDED ]]; then
SOUP - Security Onion UPdater
**WARNING** Security Onion 2.3 reaches End Of Life (EOL) on April 6, 2024.
Please make plans to migrate to Security Onion 2.4:
https://blog.securityonion.net/2023/10/6-month-eol-notice-for-security-onion-23.html
Please review the following for more information about the update process and recent updates:
https://docs.securityonion.net/soup
https://docs.securityonion.net/en/2.3/soup.html
https://blog.securityonion.net
EOF
Expand Down

0 comments on commit e321aa5

Please sign in to comment.