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

Update soup

Browse Source
This commit is contained in:
Mike Reeves
2023-11-21 09:55:44 -05:00
committed by GitHub
parent 4b0033c60a
commit 14b5aa476e
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -455,6 +455,8 @@ post_to_2.4.30() {
mv /etc/pki/managerssl.crt /etc/pki/managerssl.crt.old mv /etc/pki/managerssl.crt /etc/pki/managerssl.crt.old
mv /etc/pki/managerssl.key /etc/pki/managerssl.key.old mv /etc/pki/managerssl.key /etc/pki/managerssl.key.old
systemctl_func "start" "salt-minion" systemctl_func "start" "salt-minion"
salt-call state.apply nginx queue=True
enable_highstate
POSTVERSION=2.4.30 POSTVERSION=2.4.30
} }
@@ -751,20 +753,27 @@ apply_hotfix() {
elastic_fleet_integration_remove endpoints-initial elastic-defend-endpoints elastic_fleet_integration_remove endpoints-initial elastic-defend-endpoints
/usr/sbin/so-elastic-fleet-integration-policy-elastic-defend /usr/sbin/so-elastic-fleet-integration-policy-elastic-defend
elif [[ "$INSTALLEDVERSION" == "2.4.30" ]] ; then elif [[ "$INSTALLEDVERSION" == "2.4.30" ]] ; then
rm -f /opt/so/conf/elastic-fleet/integrations/endpoints-initial/elastic-defend-endpoints.json if [[ -f /etc/pki/managerssl.key.old ]]; then
so-kibana-restart --force echo "Fixing 20231117 not enabling highstate"
so-kibana-api-check enable_highstate
. /usr/sbin/so-elastic-fleet-common salt-call state.highstate queue=True
else
rm -f /opt/so/conf/elastic-fleet/integrations/endpoints-initial/elastic-defend-endpoints.json
so-kibana-restart --force
so-kibana-api-check
. /usr/sbin/so-elastic-fleet-common
elastic_fleet_integration_remove endpoints-initial elastic-defend-endpoints elastic_fleet_integration_remove endpoints-initial elastic-defend-endpoints
rm -f /opt/so/state/eaintegrations.txt rm -f /opt/so/state/eaintegrations.txt
salt-call state.apply ca queue=True salt-call state.apply ca queue=True
stop_salt_minion stop_salt_minion
mv /etc/pki/managerssl.crt /etc/pki/managerssl.crt.old mv /etc/pki/managerssl.crt /etc/pki/managerssl.crt.old
mv /etc/pki/managerssl.key /etc/pki/managerssl.key.old mv /etc/pki/managerssl.key /etc/pki/managerssl.key.old
systemctl_func "start" "salt-minion" systemctl_func "start" "salt-minion"
echo "Applying Salt Highstate" enable_highstate
salt-call state.highstate queue=True echo "Applying Salt Highstate"
salt-call state.highstate queue=True
fi
else else
echo "No actions required. ($INSTALLEDVERSION/$HOTFIXVERSION)" echo "No actions required. ($INSTALLEDVERSION/$HOTFIXVERSION)"
fi fi