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

Merge remote-tracking branch 'origin/centos' into palletethings

Browse Source
This commit is contained in:
m0duspwnens
2023-07-17 13:58:00 -04:00
parent fe5ca3a0c8 7fad710ca1
commit 425ca35a22
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup/so-functions
View File

@@ -981,6 +981,7 @@ detect_os() {
UBVER=20.04 UBVER=20.04
OS=ubuntu OS=ubuntu
is_ubuntu=true is_ubuntu=true
is_deb=true
not_supported=true not_supported=true
unset is_supported unset is_supported
elif grep -q "UBUNTU_CODENAME=jammy" /etc/os-release; then elif grep -q "UBUNTU_CODENAME=jammy" /etc/os-release; then
@@ -1948,7 +1949,7 @@ securityonion_repo() {
echo "gpgcheck=1" >> /etc/yum.repos.d/securityonion.repo echo "gpgcheck=1" >> /etc/yum.repos.d/securityonion.repo
fi fi
fi fi
logCmd "dnf repolist all" if [[ $is_rpm ]]; then logCmd "dnf repolist all"; fi
if [[ $waitforstate ]]; then if [[ $waitforstate ]]; then
if [[ ! $is_airgap ]]; then if [[ ! $is_airgap ]]; then
if [[ $is_rpm ]]; then if [[ $is_rpm ]]; then
@@ -2019,6 +2020,7 @@ repo_sync_local() {
} }
saltify() { saltify() {
info "Installing Salt"
SALTVERSION=$(egrep 'version: [0-9]{4}' ../salt/salt/master.defaults.yaml | sed 's/^.*version: //') SALTVERSION=$(egrep 'version: [0-9]{4}' ../salt/salt/master.defaults.yaml | sed 's/^.*version: //')
if [[ $is_deb ]]; then if [[ $is_deb ]]; then