From c1e4c4cb3049382ef8c695a78d019a623f363612 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 9 Mar 2021 11:50:27 -0500
Subject: [PATCH] fix pip and python-influxdb install

---
 setup/so-functions | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 391ac3558..9ea165548 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1917,7 +1917,8 @@ saltify() {
 				reserve_group_ids >> "$setup_log" 2>&1
 				if [[ ! $is_iso ]]; then
 				  logCmd "yum -y install epel-release"
-				  logCmd "yum -y install sqlite argon2 curl mariadb-devel"
+				  logCmd "yum -y install sqlite argon2 curl mariadb-devel python3-pip"
+				  retry 50 10 "pip3 install --user influxdb" >> "$setup_log" 2>&1 || exit 1
 				fi 
 				# Download Ubuntu Keys in case manager updates = 1
 				mkdir -p /opt/so/gpg >> "$setup_log" 2>&1
@@ -2032,7 +2033,6 @@ saltify() {
 				set_progress_str 7 'Installing salt-master'
 				retry 50 10 "apt-get -y install salt-master=3002.5+ds-1" >> "$setup_log" 2>&1 || exit 1
 				retry 50 10 "apt-mark hold salt-master" >> "$setup_log" 2>&1 || exit 1
-				retry 50 10 "pip3 install --user influxdb" >> "$setup_log" 2>&1 || exit 1
 				;;
 			*)
 				# Copy down the gpg keys and install them from the manager
@@ -2054,7 +2054,7 @@ saltify() {
 		if [[ $OSVER != 'xenial' ]]; then
 			retry 50 10 "apt-get -y install python3-pip python3-dateutil python3-m2crypto python3-mysqldb python3-influxdb" >> "$setup_log" 2>&1 || exit 1
 		else
-			retry 50 10 "apt-get -y install python-pip python-dateutil python-m2crypto python-mysqldb"  >> "$setup_log" 2>&1 || exit 1
+			retry 50 10 "apt-get -y install python-pip python-dateutil python-m2crypto python-mysqldb python-influxdb"  >> "$setup_log" 2>&1 || exit 1
 		fi
 	fi
 }