mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-06 09:12:45 +01:00
Merge pull request #131 from m0duspwnens/master
target install directory for mysql, docker and dateutil libraries for Salt
This commit is contained in:
@@ -356,8 +356,7 @@ docker_install() {
|
|||||||
yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
|
yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
|
||||||
yum -y update
|
yum -y update
|
||||||
yum -y install docker-ce
|
yum -y install docker-ce
|
||||||
pip3 install docker
|
pip3 install -t /usr/lib/python3.6/site-packages/ docker
|
||||||
set_environment_var "PYTHONPATH=$PYTHONPATH:/usr/local/lib/python3.6/site-packages/:/usr/local/lib64/python3.6/site-packages/"
|
|
||||||
if [ $INSTALLTYPE != 'EVALMODE' ]; then
|
if [ $INSTALLTYPE != 'EVALMODE' ]; then
|
||||||
docker_registry
|
docker_registry
|
||||||
fi
|
fi
|
||||||
@@ -850,7 +849,7 @@ EOF
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
pip3 install python-dateutil
|
pip3 install -t /usr/lib/python3.6/site-packages/ python-dateutil
|
||||||
yum clean expire-cache
|
yum clean expire-cache
|
||||||
yum -y install salt-minion-2019.2.2 yum-utils device-mapper-persistent-data lvm2 openssl
|
yum -y install salt-minion-2019.2.2 yum-utils device-mapper-persistent-data lvm2 openssl
|
||||||
yum -y update exclude=salt*
|
yum -y update exclude=salt*
|
||||||
@@ -988,7 +987,7 @@ salt_master_directories() {
|
|||||||
salt_install_mysql_deps() {
|
salt_install_mysql_deps() {
|
||||||
|
|
||||||
yum -y install gcc mariadb-devel python3-devel
|
yum -y install gcc mariadb-devel python3-devel
|
||||||
pip3 install mysqlclient
|
pip3 install -t /usr/lib64/python3.6/site-packages/ mysqlclient
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1038,7 +1037,7 @@ set_environment_var() {
|
|||||||
echo "Setting environment variable: $1"
|
echo "Setting environment variable: $1"
|
||||||
|
|
||||||
export "$1"
|
export "$1"
|
||||||
echo "export $1" >> /etc/profile.d/set_env_vars.sh
|
echo "$1" >> /etc/environment
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user