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

Merge remote-tracking branch 'remotes/origin/soup2350' into salt3003.1

Browse Source
This commit is contained in:
m0duspwnens
2021-04-06 15:48:36 -04:00
parent 80509fbbc6 92768ecd08
commit 9c7309797a
4 changed files with 40 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -239,6 +239,7 @@ preupgrade_changes() {
[[ "$INSTALLEDVERSION" =~ rc.3 ]] && rc3_to_2.3.0
[[ "$INSTALLEDVERSION" == 2.3.0 || "$INSTALLEDVERSION" == 2.3.1 || "$INSTALLEDVERSION" == 2.3.2 || "$INSTALLEDVERSION" == 2.3.10 ]] && up_2.3.0_to_2.3.20
[[ "$INSTALLEDVERSION" == 2.3.20 || "$INSTALLEDVERSION" == 2.3.21 ]] && up_2.3.2X_to_2.3.30
[[ "$INSTALLEDVERSION" == 2.3.30 ]] && up_2.3.3X_to_2.3.50
}
postupgrade_changes() {
@@ -409,6 +410,30 @@ up_2.3.2X_to_2.3.30() {
sed -i "/^strelka:/a \\ repos: \n - https://github.com/Neo23x0/signature-base" /opt/so/saltstack/local/pillar/global.sls;
fi
check_log_size_limit
INSTALLEDVERSION=2.3.30
}
up_2.3.3X_to_2.3.50() {
if [[ $OS == 'centos' ]]; then
# Import GPG Keys
gpg_rpm_import
if [[ ! $is_airgap ]]; then
DELREPOS=('CentOS-Base' 'CentOS-CR' 'CentOS-Debuginfo' 'docker-ce' 'CentOS-fasttrack' 'CentOS-Media' 'CentOS-Sources' 'CentOS-Vault' 'CentOS-x86_64-kernel' 'epel' 'epel-testing' 'saltstack' 'wazuh')
for DELREPO in "${DELREPOS[@]}";
rm /etc/yum.repos.d/$DELREPO
done
# Copy the new repo file if not airgap
cp $UPDATE_DIR/salt/common/yum_repos/securityonion.repo /etc/yum.repos.d/
yum clean all
yum repolist
fi
fi
INSTALLEDVERSION=2.3.50
}
verify_upgradespace() {
@@ -503,7 +528,7 @@ upgrade_salt() {
echo "Performing upgrade of Salt from $INSTALLEDSALTVERSION to $NEWSALTVERSION."
echo ""
# If CentOS
if [ "$OS" == "centos" ]; then
if [[ $OS == 'centos' ]]; then
echo "Removing yum versionlock for Salt."
echo ""
yum versionlock delete "salt-*"
@@ -514,7 +539,7 @@ upgrade_salt() {
echo ""
yum versionlock add "salt-*"
# Else do Ubuntu things
elif [ "$OS" == "ubuntu" ]; then
elif [[ $OS == 'ubuntu' ]]; then
echo "Removing apt hold for Salt."
echo ""
apt-mark unhold "salt-common"