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

remove mariadb

Browse Source
This commit is contained in:
m0duspwnens
2023-10-03 09:53:40 -04:00
parent 8995752c27
commit 66be04e78a
4 changed files with 7 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
salt/common/init.sls
View File

@@ -91,6 +91,7 @@ vimconfig:
alwaysupdated: alwaysupdated:
pkg.latest: pkg.latest:
- pkgs: - pkgs:
- openssl
- openssh-server - openssh-server
- bash - bash
- skip_suggestions: True - skip_suggestions: True

29
salt/common/packages.sls
View File

@@ -47,35 +47,15 @@ python-rich:
{% if GLOBALS.os_family == 'RedHat' %} {% if GLOBALS.os_family == 'RedHat' %}
# install versionlock first so we can hold packages in the next states remove_mariadb:
install_versionlock: pkg.removed:
pkg.installed: - name: mariadb-devel
- name: python3-dnf-plugin-versionlock
# holding these since openssl-devel-1:3.0.7-16.0.1.el9_2 seems to be a requirement for mariadb-devel-3:10.5.16-2.el9_0
# https://github.com/Security-Onion-Solutions/securityonion/discussions/11443
holdversion_openssl:
pkg.held:
- name: openssl
- version: 1:3.0.7-16.0.1.el9_2
holdversion_openssl-libs:
pkg.held:
- name: openssl-libs
- version: 1:3.0.7-16.0.1.el9_2
openssl_pkgs:
pkg.installed:
- skip_suggestions: True
- update_holds: True
- pkgs:
- openssl: 1:3.0.7-16.0.1.el9_2
- openssl-libs: 1:3.0.7-16.0.1.el9_2
commonpkgs: commonpkgs:
pkg.installed: pkg.installed:
- skip_suggestions: True - skip_suggestions: True
- pkgs: - pkgs:
- python3-dnf-plugin-versionlock
- curl - curl
- device-mapper-persistent-data - device-mapper-persistent-data
- fuse - fuse
@@ -88,7 +68,6 @@ commonpkgs:
- httpd-tools - httpd-tools
- jq - jq
- lvm2 - lvm2
- mariadb-devel
- net-tools - net-tools
- nmap-ncat - nmap-ncat
- procps-ng - procps-ng

2
salt/common/tools/sbin/so-common
View File

@@ -240,7 +240,7 @@ gpg_rpm_import() {
else else
local RPMKEYSLOC="$UPDATE_DIR/salt/repo/client/files/$OS/keys" local RPMKEYSLOC="$UPDATE_DIR/salt/repo/client/files/$OS/keys"
fi fi
RPMKEYS=('RPM-GPG-KEY-oracle' 'RPM-GPG-KEY-EPEL-9' 'SALT-PROJECT-GPG-PUBKEY-2023.pub' 'docker.pub' 'securityonion.pub' 'MariaDB-Server-GPG-KEY') RPMKEYS=('RPM-GPG-KEY-oracle' 'RPM-GPG-KEY-EPEL-9' 'SALT-PROJECT-GPG-PUBKEY-2023.pub' 'docker.pub' 'securityonion.pub')
for RPMKEY in "${RPMKEYS[@]}"; do for RPMKEY in "${RPMKEYS[@]}"; do
rpm --import $RPMKEYSLOC/$RPMKEY rpm --import $RPMKEYSLOC/$RPMKEY
echo "Imported $RPMKEY" echo "Imported $RPMKEY"

3
setup/so-functions
View File

@@ -2444,8 +2444,7 @@ update_packages() {
if [[ $is_oracle ]]; then if [[ $is_oracle ]]; then
logCmd "dnf repolist" logCmd "dnf repolist"
# holding openssl https://github.com/Security-Onion-Solutions/securityonion/discussions/11443 # holding openssl https://github.com/Security-Onion-Solutions/securityonion/discussions/11443
logCmd "dnf -y install openssl-1:3.0.7-16.0.1.el9_2 openssl-libs-1:3.0.7-16.0.1.el9_2 openssl-devel-1:3.0.7-16.0.1.el9_2" logCmd "dnf -y update --allowerasing --exclude=salt*,docker*,containerd*"
logCmd "dnf -y update --allowerasing --exclude=salt*,docker*,containerd*,openssl*"
RMREPOFILES=("oracle-linux-ol9.repo" "uek-ol9.repo" "virt-ol9.repo") RMREPOFILES=("oracle-linux-ol9.repo" "uek-ol9.repo" "virt-ol9.repo")
info "Removing repo files added by oracle-repos package update" info "Removing repo files added by oracle-repos package update"
for FILE in ${RMREPOFILES[@]}; do for FILE in ${RMREPOFILES[@]}; do