From 3f02fed27717eb2954dcd705e40647018e9af772 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 12 Nov 2019 15:16:28 -0500
Subject: [PATCH 1/4] change PYTHONPATH assignment -
 https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/105

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

diff --git a/so-setup-network.sh b/so-setup-network.sh
index ee8f932bc..4121b9ecf 100644
--- a/so-setup-network.sh
+++ b/so-setup-network.sh
@@ -357,7 +357,7 @@ docker_install() {
     yum -y update
     yum -y install docker-ce
     pip3 install docker
-    set_environment_var "PYTHONPATH=$PYTHONPATH:/usr/local/lib/python3.6/site-packages/:/usr/local/lib64/python3.6/site-packages/"
+    set_environment_var "PYTHONPATH=/usr/local/lib/python3.6/site-packages:/usr/local/lib64/python3.6/site-packages"
     if [ $INSTALLTYPE != 'EVALMODE'  ]; then
       docker_registry
     fi
@@ -1038,7 +1038,7 @@ set_environment_var() {
   echo "Setting environment variable: $1"
 
   export "$1"
-  echo "export $1" >> /etc/profile.d/set_env_vars.sh
+  echo "$1" >> /etc/environment
 
 }
 

From d809718d9e60dc5de4957cf017b2e66204b0efa1 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 12 Nov 2019 16:03:26 -0500
Subject: [PATCH 2/4] add --user to pip3 install

---
 so-setup-network.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/so-setup-network.sh b/so-setup-network.sh
index 4121b9ecf..ca37e4da6 100644
--- a/so-setup-network.sh
+++ b/so-setup-network.sh
@@ -356,7 +356,7 @@ docker_install() {
     yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
     yum -y update
     yum -y install docker-ce
-    pip3 install docker
+    pip3 install --user docker
     set_environment_var "PYTHONPATH=/usr/local/lib/python3.6/site-packages:/usr/local/lib64/python3.6/site-packages"
     if [ $INSTALLTYPE != 'EVALMODE'  ]; then
       docker_registry
@@ -850,7 +850,7 @@ EOF
       fi
     fi
 
-    pip3 install python-dateutil
+    pip3 install --user python-dateutil
     yum clean expire-cache
     yum -y install salt-minion-2019.2.2 yum-utils device-mapper-persistent-data lvm2 openssl
     yum -y update exclude=salt*
@@ -988,7 +988,7 @@ salt_master_directories() {
 salt_install_mysql_deps() {
 
   yum -y install gcc mariadb-devel python3-devel
-  pip3 install mysqlclient
+  pip3 install --user mysqlclient
 
 }
 

From 5fc08a39b49b81c20c8f7a1601c5498090cf5115 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 12 Nov 2019 16:54:32 -0500
Subject: [PATCH 3/4] change target directory of pip3 installs

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

diff --git a/so-setup-network.sh b/so-setup-network.sh
index ca37e4da6..dfc3d1ee1 100644
--- a/so-setup-network.sh
+++ b/so-setup-network.sh
@@ -356,8 +356,7 @@ docker_install() {
     yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
     yum -y update
     yum -y install docker-ce
-    pip3 install --user docker
-    set_environment_var "PYTHONPATH=/usr/local/lib/python3.6/site-packages:/usr/local/lib64/python3.6/site-packages"
+    pip3 install --user -t /usr/lib/python3.6/site-packages docker
     if [ $INSTALLTYPE != 'EVALMODE'  ]; then
       docker_registry
     fi
@@ -850,7 +849,7 @@ EOF
       fi
     fi
 
-    pip3 install --user python-dateutil
+    pip3 install --user -t /usr/lib/python3.6/site-packages python-dateutil
     yum clean expire-cache
     yum -y install salt-minion-2019.2.2 yum-utils device-mapper-persistent-data lvm2 openssl
     yum -y update exclude=salt*
@@ -988,7 +987,7 @@ salt_master_directories() {
 salt_install_mysql_deps() {
 
   yum -y install gcc mariadb-devel python3-devel
-  pip3 install --user mysqlclient
+  pip3 install --user -t /usr/lib64/python3.6/site-packages mysqlclient
 
 }
 

From b15886b26a4a43108d94032184324d78a4912f84 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 12 Nov 2019 17:51:59 -0500
Subject: [PATCH 4/4] remove --user add trailing / for pip3 target install

---
 so-setup-network.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/so-setup-network.sh b/so-setup-network.sh
index dfc3d1ee1..bfdcad7a9 100644
--- a/so-setup-network.sh
+++ b/so-setup-network.sh
@@ -356,7 +356,7 @@ docker_install() {
     yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
     yum -y update
     yum -y install docker-ce
-    pip3 install --user -t /usr/lib/python3.6/site-packages docker
+    pip3 install -t /usr/lib/python3.6/site-packages/ docker
     if [ $INSTALLTYPE != 'EVALMODE'  ]; then
       docker_registry
     fi
@@ -849,7 +849,7 @@ EOF
       fi
     fi
 
-    pip3 install --user -t /usr/lib/python3.6/site-packages python-dateutil
+    pip3 install -t /usr/lib/python3.6/site-packages/ python-dateutil
     yum clean expire-cache
     yum -y install salt-minion-2019.2.2 yum-utils device-mapper-persistent-data lvm2 openssl
     yum -y update exclude=salt*
@@ -987,7 +987,7 @@ salt_master_directories() {
 salt_install_mysql_deps() {
 
   yum -y install gcc mariadb-devel python3-devel
-  pip3 install --user -t /usr/lib64/python3.6/site-packages mysqlclient
+  pip3 install -t /usr/lib64/python3.6/site-packages/ mysqlclient
 
 }