From 47e418a441e4dcf63a8e3a03960c9731149c2b77 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Thu, 20 Jul 2023 12:07:26 -0400
Subject: [PATCH 1/2] Add epel-next

---
 setup/so-functions | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 62be1c31e..6d9aa505c 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -2007,21 +2007,24 @@ repo_sync_local() {
 		# Add the proper repos for unsupported stuff
 		echo "Adding Repos"
 		if [[ $is_rpm ]]; then
-			dnf -y install epel-release
-			dnf install -y yum-utils device-mapper-persistent-data lvm2
-			curl -fsSL https://repo.securityonion.net/file/so-repo/prod/2.4/so/so.repo | tee /etc/yum.repos.d/so.repo
-			rpm --import https://repo.saltproject.io/salt/py3/redhat/9/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub
 			if [[ $is_rhel ]]; then
-				dnf config-manager --add-repo https://download.docker.com/linux/rhel/docker-ce.repo
-				curl -fsSL https://repo.saltproject.io/salt/py3/redhat/9/x86_64/minor/3006.1.repo | tee /etc/yum.repos.d/salt.repo
-			else
-				dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
-				curl -fsSL https://repo.saltproject.io/salt/py3/redhat/9/x86_64/minor/3006.1.repo | tee /etc/yum.repos.d/salt.repo
-			fi
-			if [[ ! $is_oracle ]]; then
-				dnf config-manager --set-enabled crb
-				dnf repolist
+				logCmd "subscription-manager repos --enable codeready-builder-for-rhel-9-$(arch)-rpms"
+				info "Install epel for rhel" 
+				logCmd "dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm"
+				logCmd "dnf -y install https://dl.fedoraproject.org/pub/epel/epel-next-release-latest-9.noarch.rpm"
+			else  
+				logCmd "dnf config-manager --set-enabled crb"
+				logCmd "dnf -y install epel-release epel-next"
 			fi
+			dnf install -y yum-utils device-mapper-persistent-data lvm2
+			# This was for python3-rich
+			#curl -fsSL https://repo.securityonion.net/file/so-repo/prod/2.4/so/so.repo | tee /etc/yum.repos.d/so.repo
+			rpm --import https://repo.saltproject.io/salt/py3/redhat/9/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub
+			dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
+			curl -fsSL https://repo.saltproject.io/salt/py3/redhat/9/x86_64/minor/3006.1.repo | tee /etc/yum.repos.d/salt.repo
+			dnf config-manager --set-enabled crb
+			dnf repolist
+			curl --retry 5 --retry-delay 60 -A "netinstall/$SOVERSION/$OS/$(uname -r)/1" https://sigs.securityonion.net/checkup --output /tmp/install
 		else
 			echo "Not sure how you got here."
 			exit 1

From f2947de0ca001c51594d1fae3dc0f7ca769713ed Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Thu, 20 Jul 2023 12:13:36 -0400
Subject: [PATCH 2/2] Add epel-next

---
 setup/so-functions | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 6d9aa505c..35f836746 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -2017,12 +2017,10 @@ repo_sync_local() {
 				logCmd "dnf -y install epel-release epel-next"
 			fi
 			dnf install -y yum-utils device-mapper-persistent-data lvm2
-			# This was for python3-rich
-			#curl -fsSL https://repo.securityonion.net/file/so-repo/prod/2.4/so/so.repo | tee /etc/yum.repos.d/so.repo
+			curl -fsSL https://repo.securityonion.net/file/so-repo/prod/2.4/so/so.repo | tee /etc/yum.repos.d/so.repo
 			rpm --import https://repo.saltproject.io/salt/py3/redhat/9/x86_64/SALT-PROJECT-GPG-PUBKEY-2023.pub
 			dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
 			curl -fsSL https://repo.saltproject.io/salt/py3/redhat/9/x86_64/minor/3006.1.repo | tee /etc/yum.repos.d/salt.repo
-			dnf config-manager --set-enabled crb
 			dnf repolist
 			curl --retry 5 --retry-delay 60 -A "netinstall/$SOVERSION/$OS/$(uname -r)/1" https://sigs.securityonion.net/checkup --output /tmp/install
 		else