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

[fix] Move common package install and fix typo

Browse Source
This commit is contained in:
William Wernert
2020-04-23 11:52:21 -04:00
parent 805299bc75
commit 46fd4cf96e
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
setup/so-functions
View File

@@ -946,16 +946,15 @@ saltify() {
# Install updates and Salt # Install updates and Salt
if [ $OS = 'centos' ]; then if [ $OS = 'centos' ]; then
set_progress_str 6 'Installing various dependencies' set_progress_str 6 'Installing various dependencies'
{
yum -y install https://repo.saltstack.com/py3/redhat/salt-py3-repo-latest-2.el7.noarch.rpm;
cp /etc/yum.repos.d/salt-py3-latest.repo /etc/yum.repos.d/salt-2019-2.repo;
sed -i 's/latest/2019.2/g' /etc/yum.repos.d/salt-2019-2.repo;
} >> "$setup_log" 2>&1
case "$install_type" in case "$install_type" in
'MASTER' | 'EVAL' | 'MASTERSEARCH' | 'FLEET') # FIXME: should this be separate? 'MASTER' | 'EVAL' | 'MASTERSEARCH' | 'FLEET' | 'HELIXSENSOR')
yum instal -y mariadb-devel >> "$setup_log" 2>&1
;&
'HELIXSENSOR')
reserve_group_ids >> "$setup_log" 2>&1 reserve_group_ids >> "$setup_log" 2>&1
yum -y install epel-release >> "$setup_log" 2>&1 yum -y install epel-release >> "$setup_log" 2>&1
yum -y install wget https://repo.saltstack.com/py3/redhat/salt-py3-repo-latest-2.el7.noarch.rpm >> "$setup_log" 2>&1
cp /etc/yum.repos.d/salt-py3-latest.repo /etc/yum.repos.d/salt-py3-2019-2.repo >> "$setup_log" 2>&1
sed -i 's/latest/2019.2/g' /etc/yum.repos.d/salt-py3-2019-2.repo >> "$setup_log" 2>&1
yum -y install sqlite3 argon2 curl jq openssl mariadb-devel >> "$setup_log" 2>&1 yum -y install sqlite3 argon2 curl jq openssl mariadb-devel >> "$setup_log" 2>&1
# Download Ubuntu Keys in case master updates = 1 # Download Ubuntu Keys in case master updates = 1
mkdir -p /opt/so/gpg >> "$setup_log" 2>&1 mkdir -p /opt/so/gpg >> "$setup_log" 2>&1
@@ -980,12 +979,6 @@ saltify() {
cp "./yum_repos/salt-latest.repo" /etc/yum.repos.d/salt-latest.repo; cp "./yum_repos/salt-latest.repo" /etc/yum.repos.d/salt-latest.repo;
cp "./yum_repos/salt-2019-2.repo" /etc/yum.repos.d/salt-2019-2.repo; cp "./yum_repos/salt-2019-2.repo" /etc/yum.repos.d/salt-2019-2.repo;
} >> "$setup_log" 2>&1 } >> "$setup_log" 2>&1
else
{
yum -y install https://repo.saltstack.com/py3/redhat/salt-py3-repo-latest-2.el7.noarch.rpm;
cp /etc/yum.repos.d/salt-py3-latest.repo /etc/yum.repos.d/salt-2019-2.repo;
sed -i 's/latest/2019.2/g' /etc/yum.repos.d/salt-2019-2.repo;
} >> "$setup_log" 2>&1
fi fi
;; ;;
esac esac