Skip to content

Commit

Permalink
Merge pull request #12213 from Security-Onion-Solutions/reyesj2-patch-sl
Browse files Browse the repository at this point in the history
Update soup
  • Loading branch information
reyesj2 authored Jan 19, 2024
2 parents 97e2721 + ca4f2f1 commit 0786806
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions salt/manager/tools/sbin/soup
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,7 @@ preupgrade_changes() {
[[ "$INSTALLEDVERSION" == 2.4.10 ]] && up_to_2.4.20
[[ "$INSTALLEDVERSION" == 2.4.20 ]] && up_to_2.4.30
[[ "$INSTALLEDVERSION" == 2.4.30 ]] && up_to_2.4.40
[[ "$INSTALLEDVERSION" == 2.4.40 ]] && up_to_2.4.50
true
}

Expand All @@ -419,6 +420,7 @@ postupgrade_changes() {
[[ "$POSTVERSION" == 2.4.10 ]] && post_to_2.4.20
[[ "$POSTVERSION" == 2.4.20 ]] && post_to_2.4.30
[[ "$POSTVERSION" == 2.4.30 ]] && post_to_2.4.40
[[ "$POSTVERSION" == 2.4.40 ]] && post_to_2.4.50
true
}

Expand Down Expand Up @@ -470,6 +472,11 @@ post_to_2.4.40() {
POSTVERSION=2.4.40
}

post_to_2.4.50() {
echo "Nothing to apply"
POSTVERSION=2.4.50
}

repo_sync() {
echo "Sync the local repo."
su socore -c '/usr/sbin/so-repo-sync' || fail "Unable to complete so-repo-sync."
Expand Down Expand Up @@ -570,6 +577,14 @@ up_to_2.4.40() {
INSTALLEDVERSION=2.4.40
}

up_to_2.4.50() {
echo "Creating additional pillars.."
touch /opt/so/saltstack/local/pillar/stig/adv_stig.sls
touch /opt/so/saltstack/local/pillar/stig/soc_stig.sls

INSTALLEDVERSION=2.4.50
}

determine_elastic_agent_upgrade() {
if [[ $is_airgap -eq 0 ]]; then
update_elastic_agent_airgap
Expand Down

0 comments on commit 0786806

Please sign in to comment.