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

exclude import from snapshotting previous version pillars and states

Browse Source
This commit is contained in:
m0duspwnens
2023-09-27 18:20:50 -04:00
parent 036a21ff17
commit 76c0b881ff
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -518,7 +518,7 @@ up_to_2.4.10() {
} }
up_to_2.4.20() { up_to_2.4.20() {
echo "Nothing to do for 2.4.20" echo "Preupgrade soup changes for 2.4.20"
INSTALLEDVERSION=2.4.20 INSTALLEDVERSION=2.4.20
} }
@@ -796,7 +796,10 @@ main() {
if [ "$is_hotfix" == "true" ]; then if [ "$is_hotfix" == "true" ]; then
echo "Applying $HOTFIXVERSION hotfix" echo "Applying $HOTFIXVERSION hotfix"
backup_old_states_pillars # since we don't run the backup.config_backup state on import we wont snapshot previous version states and pillars
if [[ ! "$MINIONID" =~ "_import" ]]; then
backup_old_states_pillars
fi
copy_new_files copy_new_files
apply_hotfix apply_hotfix
echo "Hotfix applied" echo "Hotfix applied"
@@ -853,9 +856,12 @@ main() {
update_centos_repo update_centos_repo
fi fi
echo "" # since we don't run the backup.config_backup state on import we wont snapshot previous version states and pillars
echo "Creating snapshots of default and local Salt states and pillars and saving to /nsm/backup/" if [[ ! "$MINIONID" =~ "_import" ]]; then
backup_old_states_pillars echo ""
echo "Creating snapshots of default and local Salt states and pillars and saving to /nsm/backup/"
backup_old_states_pillars
fi
echo "" echo ""
echo "Copying new Security Onion code from $UPDATE_DIR to $DEFAULT_SALT_DIR." echo "Copying new Security Onion code from $UPDATE_DIR to $DEFAULT_SALT_DIR."