From 1248ba892400369d5092cb1b3441b124b8cb9e79 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 5 Apr 2022 15:40:39 -0400
Subject: [PATCH] update update_repo function

---
 salt/common/tools/sbin/soup                       | 15 +++++++++++++--
 .../repo/client/files/ubuntu/18.04/saltstack.list |  1 -
 .../repo/client/files/ubuntu/20.04/saltstack.list |  1 -
 salt/repo/client/ubuntu.sls                       |  9 +++++----
 4 files changed, 18 insertions(+), 8 deletions(-)
 delete mode 100644 salt/repo/client/files/ubuntu/18.04/saltstack.list
 delete mode 100644 salt/repo/client/files/ubuntu/20.04/saltstack.list

diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index a46938da9..b64a778ea 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -935,8 +935,19 @@ update_repo() {
       yum repolist
     fi
   elif [[ "$OS" == "ubuntu" ]]; then
-      cp $UPDATE_DIR/salt/repo/client/files/ubuntu/$ubuntu_version/* /etc/apt/sources.list.d/
-      apt-get update
+    ubuntu_version=$(grep VERSION_ID /etc/os-release | awk -F '[ "]' '{print $2}')
+
+    if grep -q "UBUNTU_CODENAME=bionic" /etc/os-release; then
+      OSVER=bionic
+    elif grep -q "UBUNTU_CODENAME=focal" /etc/os-release; then
+      OSVER=focal
+    else
+      echo "We do not support your current version of Ubuntu."
+      exit 1
+    fi
+
+    echo "deb http://repo.saltstack.com/py3/ubuntu/$ubuntu_version/amd64/archive/3004.1 $OSVER main" > /etc/apt/sources.list.d/saltstack.list
+    apt-get update
   fi
 }
 
diff --git a/salt/repo/client/files/ubuntu/18.04/saltstack.list b/salt/repo/client/files/ubuntu/18.04/saltstack.list
deleted file mode 100644
index b41f03856..000000000
--- a/salt/repo/client/files/ubuntu/18.04/saltstack.list
+++ /dev/null
@@ -1 +0,0 @@
-deb https://repo.securityonion.net/file/securityonion-repo/ubuntu/18.04/amd64/salt/ bionic main
diff --git a/salt/repo/client/files/ubuntu/20.04/saltstack.list b/salt/repo/client/files/ubuntu/20.04/saltstack.list
deleted file mode 100644
index bc7236d82..000000000
--- a/salt/repo/client/files/ubuntu/20.04/saltstack.list
+++ /dev/null
@@ -1 +0,0 @@
-deb https://repo.securityonion.net/file/securityonion-repo/ubuntu/20.04/amd64/salt/ focal main
diff --git a/salt/repo/client/ubuntu.sls b/salt/repo/client/ubuntu.sls
index 449b4ae14..a7b7a90af 100644
--- a/salt/repo/client/ubuntu.sls
+++ b/salt/repo/client/ubuntu.sls
@@ -1,4 +1,5 @@
-ubuntu_repo_files:
-  - file.recurse:
-      - name: /etc/apt/sources.list.d/
-      - source: salt://repo/client/files/ubuntu/{{grains.osrelease}}/
+saltstack.list:
+  - file.managed:
+      - name: /etc/apt/sources.list.d/saltstack.list
+      - contents:
+        - deb https://repo.securityonion.net/file/securityonion-repo/ubuntu/{{grains.osrelease}}/amd64/salt/ {{grains.oscodename}} main