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

Merge pull request #11749 from Security-Onion-Solutions/TOoSmOotH-patch-6

Browse Source 
Update soup
This commit is contained in:
Mike Reeves
2023-11-09 10:49:34 -05:00
committed by GitHub
parent ac4428940e 07df045e79
commit e321aa52a5
1 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
salt/common/tools/sbin/soup
View File

@@ -580,6 +580,7 @@ preupgrade_changes() {
[[ "$INSTALLEDVERSION" == 2.3.240 ]] && up_to_2.3.250 [[ "$INSTALLEDVERSION" == 2.3.240 ]] && up_to_2.3.250
[[ "$INSTALLEDVERSION" == 2.3.250 ]] && up_to_2.3.260 [[ "$INSTALLEDVERSION" == 2.3.250 ]] && up_to_2.3.260
[[ "$INSTALLEDVERSION" == 2.3.260 ]] && up_to_2.3.270 [[ "$INSTALLEDVERSION" == 2.3.260 ]] && up_to_2.3.270
[[ "$INSTALLEDVERSION" == 2.3.270 ]] && up_to_2.3.280
true true
} }
@@ -612,6 +613,7 @@ postupgrade_changes() {
[[ "$POSTVERSION" == 2.3.240 ]] && post_to_2.3.250 [[ "$POSTVERSION" == 2.3.240 ]] && post_to_2.3.250
[[ "$POSTVERSION" == 2.3.250 ]] && post_to_2.3.260 [[ "$POSTVERSION" == 2.3.250 ]] && post_to_2.3.260
[[ "$POSTVERSION" == 2.3.260 ]] && post_to_2.3.270 [[ "$POSTVERSION" == 2.3.260 ]] && post_to_2.3.270
[[ "$POSTVERSION" == 2.3.270 ]] && post_to_2.3.280
true true
} }
@@ -772,6 +774,13 @@ post_to_2.3.270() {
POSTVERSION=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() { 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
set +e set +e
@@ -1137,6 +1146,11 @@ up_to_2.3.270() {
INSTALLEDVERSION=2.3.270 INSTALLEDVERSION=2.3.270
} }
up_to_2.3.280() {
echo "Upgrading to 2.3.280"
INSTALLEDVERSION=2.3.280
}
verify_upgradespace() { verify_upgradespace() {
CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}' | sed 's/.$//') CURRENTSPACE=$(df -BG / | grep -v Avail | awk '{print $4}' | sed 's/.$//')
if [ "$CURRENTSPACE" -lt "10" ]; then if [ "$CURRENTSPACE" -lt "10" ]; then
@@ -1720,8 +1734,12 @@ if [[ -z $UNATTENDED ]]; then
SOUP - Security Onion UPdater 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: 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 https://blog.securityonion.net
EOF EOF