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

need to make the repo changes before we try to upgrade sa;t

Browse Source
This commit is contained in:
m0duspwnens
2021-04-07 12:41:01 -04:00
parent b7aa9ddaa3
commit 5578206bf1
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -230,6 +230,13 @@ masterunlock() {
fi fi
} }
preupgrade_changes_2.3.50_repo() {
# We made repo changes in 2.3.50 and this prepares for that on upgrade
echo "Checking to see if 2.3.50 repo changes are needed."
[[ "$INSTALLEDVERSION" == 2.3.30 || "$INSTALLEDVERSION" == 2.3.40 ]] && up_2.3.3X_to_2.3.50_repo
}
preupgrade_changes() { preupgrade_changes() {
# This function is to add any new pillar items if needed. # This function is to add any new pillar items if needed.
echo "Checking to see if changes are needed." echo "Checking to see if changes are needed."
@@ -413,7 +420,7 @@ up_2.3.2X_to_2.3.30() {
INSTALLEDVERSION=2.3.30 INSTALLEDVERSION=2.3.30
} }
up_2.3.3X_to_2.3.50() { up_2.3.3X_to_2.3.50_repo() {
if [[ "$OS" == "centos" ]]; then if [[ "$OS" == "centos" ]]; then
# Import GPG Keys # Import GPG Keys
gpg_rpm_import gpg_rpm_import
@@ -434,6 +441,9 @@ up_2.3.3X_to_2.3.50() {
yum repolist yum repolist
fi fi
fi fi
}
up_2.3.3X_to_2.3.50() {
INSTALLEDVERSION=2.3.50 INSTALLEDVERSION=2.3.50
} }
@@ -655,6 +665,7 @@ else
update_registry update_registry
update_docker_containers "soup" update_docker_containers "soup"
fi fi
echo "" echo ""
echo "Stopping Salt Minion service." echo "Stopping Salt Minion service."
systemctl stop salt-minion systemctl stop salt-minion
@@ -665,6 +676,8 @@ echo "Stopping Salt Master service."
systemctl stop salt-master systemctl stop salt-master
echo "" echo ""
preupgrade_changes_2.3.50_repo
# Does salt need upgraded. If so update it. # Does salt need upgraded. If so update it.
if [ "$UPGRADESALT" == "1" ]; then if [ "$UPGRADESALT" == "1" ]; then
echo "Upgrading Salt" echo "Upgrading Salt"