From 6bcadded1452a4d02bdf709718b17e4e17341fea Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Fri, 15 Nov 2019 18:16:27 -0500
Subject: [PATCH] change scp of pillar files, install pip3 for centos

---
 so-setup-network.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/so-setup-network.sh b/so-setup-network.sh
index e1adb38c8..a2871a9f5 100644
--- a/so-setup-network.sh
+++ b/so-setup-network.sh
@@ -278,7 +278,7 @@ copy_minion_tmp_files() {
     rsync -a -v $TMP/ /opt/so/saltstack/ >> $SETUPLOG 2>&1
   else
     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
 
   }
@@ -488,9 +488,12 @@ install_cleanup() {
 
 install_pip3() {
 
+  echo "Installing pip3"
+
   if [ $OS == 'ubuntu' ]; then
-    echo -e "XXX\n0\nInstalling pip3... \nXXX"
     apt-get -y install python3-pip gcc python3-dev
+  elif [ $OS == 'centos' ]; then
+    yum -y install python3-pip gcc python3-devel
   fi
 
 }
@@ -716,7 +719,7 @@ saltify() {
     ADDUSER=adduser
 
     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
       sed -i 's/latest/2019.2/g' /etc/yum.repos.d/salt-2019-2.repo
       cat > /etc/yum.repos.d/wazuh.repo <<\EOF
@@ -1006,7 +1009,7 @@ salt_master_directories() {
 salt_install_mysql_deps() {
 
   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"
     pip3 install -t /usr/lib64/python3.6/site-packages/ mysqlclient
   elif [ $OS == 'ubuntu' ]; then