mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-06 09:12:45 +01:00
change scp of pillar files, install pip3 for centos
This commit is contained in:
@@ -278,7 +278,7 @@ copy_minion_tmp_files() {
|
|||||||
rsync -a -v $TMP/ /opt/so/saltstack/ >> $SETUPLOG 2>&1
|
rsync -a -v $TMP/ /opt/so/saltstack/ >> $SETUPLOG 2>&1
|
||||||
else
|
else
|
||||||
echo "scp all files in $TMP to master /opt/so/saltstack" >> $SETUPLOG 2>&1
|
echo "scp all files in $TMP to master /opt/so/saltstack" >> $SETUPLOG 2>&1
|
||||||
scp -prv -i /root/.ssh/so.key "${TMP}/*" socore@$MSRV:/opt/so/saltstack >> $SETUPLOG 2>&1
|
scp -prv -i /root/.ssh/so.key $TMP/* socore@$MSRV:/opt/so/saltstack >> $SETUPLOG 2>&1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -488,9 +488,12 @@ install_cleanup() {
|
|||||||
|
|
||||||
install_pip3() {
|
install_pip3() {
|
||||||
|
|
||||||
|
echo "Installing pip3"
|
||||||
|
|
||||||
if [ $OS == 'ubuntu' ]; then
|
if [ $OS == 'ubuntu' ]; then
|
||||||
echo -e "XXX\n0\nInstalling pip3... \nXXX"
|
|
||||||
apt-get -y install python3-pip gcc python3-dev
|
apt-get -y install python3-pip gcc python3-dev
|
||||||
|
elif [ $OS == 'centos' ]; then
|
||||||
|
yum -y install python3-pip gcc python3-devel
|
||||||
fi
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -716,7 +719,7 @@ saltify() {
|
|||||||
ADDUSER=adduser
|
ADDUSER=adduser
|
||||||
|
|
||||||
if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ]; then
|
if [ $INSTALLTYPE == 'MASTERONLY' ] || [ $INSTALLTYPE == 'EVALMODE' ]; then
|
||||||
yum -y install https://repo.saltstack.com/py3/redhat/salt-py3-repo-latest-2.el7.noarch.rpm
|
yum -y install https://repo.saltstack.com/py3/redhat/salt-py3-repo-2019.2-2.el7.noarch.rpm
|
||||||
cp /etc/yum.repos.d/salt-latest.repo /etc/yum.repos.d/salt-2019-2.repo
|
cp /etc/yum.repos.d/salt-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
|
sed -i 's/latest/2019.2/g' /etc/yum.repos.d/salt-2019-2.repo
|
||||||
cat > /etc/yum.repos.d/wazuh.repo <<\EOF
|
cat > /etc/yum.repos.d/wazuh.repo <<\EOF
|
||||||
@@ -1006,7 +1009,7 @@ salt_master_directories() {
|
|||||||
salt_install_mysql_deps() {
|
salt_install_mysql_deps() {
|
||||||
|
|
||||||
if [ $OS == 'centos' ]; then
|
if [ $OS == 'centos' ]; then
|
||||||
yum -y install gcc mariadb-devel python3-devel
|
yum -y install mariadb-devel
|
||||||
echo "Using pip3 to install mysqlclient for salt"
|
echo "Using pip3 to install mysqlclient for salt"
|
||||||
pip3 install -t /usr/lib64/python3.6/site-packages/ mysqlclient
|
pip3 install -t /usr/lib64/python3.6/site-packages/ mysqlclient
|
||||||
elif [ $OS == 'ubuntu' ]; then
|
elif [ $OS == 'ubuntu' ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user