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

merge conflicts

Browse Source
This commit is contained in:
Jason Ertel
2022-11-10 16:47:52 -05:00
parent 18cd7a83c6 fc649a565c
commit 595a95fdf5
4 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -549,7 +549,8 @@ preupgrade_changes() {
[[ "$INSTALLEDVERSION" == 2.3.160 ]] && up_to_2.3.170
[[ "$INSTALLEDVERSION" == 2.3.170 ]] && up_to_2.3.180
[[ "$INSTALLEDVERSION" == 2.3.180 ]] && up_to_2.3.181
[[ "$INSTALLEDVERSION" == 2.3.181 ]] && up_to_2.3.190
[[ "$INSTALLEDVERSION" == 2.3.181 ]] && up_to_2.3.182
[[ "$INSTALLEDVERSION" == 2.3.182 ]] && up_to_2.3.190
true
}
@@ -571,7 +572,8 @@ postupgrade_changes() {
[[ "$POSTVERSION" == 2.3.160 ]] && post_to_2.3.170
[[ "$POSTVERSION" == 2.3.170 ]] && post_to_2.3.180
[[ "$POSTVERSION" == 2.3.180 ]] && post_to_2.3.181
[[ "$POSTVERSION" == 2.3.181 ]] && post_to_2.3.190
[[ "$POSTVERSION" == 2.3.181 ]] && post_to_2.3.182
[[ "$POSTVERSION" == 2.3.182 ]] && post_to_2.3.190
true
}
@@ -680,6 +682,11 @@ post_to_2.3.181() {
POSTVERSION=2.3.181
}
post_to_2.3.182() {
echo "Nothing to do for .182"
POSTVERSION=2.3.182
}
post_to_2.3.190() {
echo "Nothing to do for .190"
POSTVERSION=2.3.190
@@ -984,6 +991,11 @@ up_to_2.3.181() {
INSTALLEDVERSION=2.3.181
}
up_to_2.3.182() {
echo "Upgrading to 2.3.182"
INSTALLEDVERSION=2.3.182
}
up_to_2.3.190() {
echo "Upgrading to 2.3.190"
chown -R zeek:socore /nsm/zeek/extracted/complete