From eb94c011e22ec056501b5aee66da88a39054a5f5 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 13 Apr 2021 11:15:15 -0400
Subject: [PATCH] update location of yum keys and repo files for setup

---
 salt/common/tools/sbin/so-common | 4 ++--
 setup/so-functions               | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common
index a2c28587d..97e61e6e2 100755
--- a/salt/common/tools/sbin/so-common
+++ b/salt/common/tools/sbin/so-common
@@ -165,9 +165,9 @@ get_random_value() {
 gpg_rpm_import() {
 	if [[ "$OS" == "centos" ]]; then
 	    if [[ "$WHATWOULDYOUSAYYAHDOHERE" == "setup" ]]; then
-	        local RPMKEYSLOC="../salt/common/keys"
+	        local RPMKEYSLOC="../salt/repo/client/files/centos/keys"
 	    else
-	        local RPMKEYSLOC="$UPDATEDIR/salt/common/keys"
+	        local RPMKEYSLOC="$UPDATEDIR/salt/repo/client/files/centos/keys"
 	    fi
 	
 	    RPMKEYS=('RPM-GPG-KEY-EPEL-7' 'GPG-KEY-WAZUH' 'docker.pub' 'SALTSTACK-GPG-KEY.pub' 'securityonion.pub')
diff --git a/setup/so-functions b/setup/so-functions
index d3a695fa1..ae65c7547 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -2300,9 +2300,9 @@ securityonion_repo() {
 			yum repolist all
 			mkdir -p /etc/yum.repos.d
 		    if [[ ! $is_manager && "$MANAGERUPDATES" == "1" ]]; then
-		        cp -f ../salt/common/yum_repos/securityonioncache.repo /etc/yum.repos.d/
+		        cp -f ../salt/repo/client/files/centos/securityonioncache.repo /etc/yum.repos.d/
 		    else
-		        cp -f ../salt/common/yum_repos/securityonion.repo /etc/yum.repos.d/
+		        cp -f ../salt/repo/client/files/centos/securityonion.repo /etc/yum.repos.d/
 		    fi
 		fi
 	else