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

copy_new_files usage consistent across soup and hotfixapply scripts

Browse Source
This commit is contained in:
Jason Ertel
2021-05-03 15:42:24 -04:00
parent a489b369d7
commit 6768e8ddf6
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,6 @@ UPDATE_DIR=/tmp/sogh/securityonion
INSTALLEDVERSION=$(cat /etc/soversion)
POSTVERSION=$INSTALLEDVERSION
INSTALLEDSALTVERSION=$(salt --versions-report | grep Salt: | awk {'print $2'})
DEFAULT_SALT_DIR=/opt/so/saltstack/default
BATCHSIZE=5
SOUP_LOG=/root/soup.log
WHATWOULDYOUSAYYAHDOHERE=soup
@@ -714,9 +713,7 @@ upgrade_check_salt
if [[ $is_hotfix ]]; then
echo "Applying $HOTFIXVERSION"
cd $UPDATE_DIR
copy_new_files
cd /tmp
echo ""
update_version
salt-call state.highstate -l info queue=True
@@ -787,7 +784,6 @@ else
echo ""
echo "Copying new Security Onion code from $UPDATE_DIR to $DEFAULT_SALT_DIR."
copy_new_files
cd /tmp
echo ""
update_version