From 33fdc239659ef2022a2fd82c4c5ab09088b04776 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Tue, 12 Nov 2024 11:31:42 -0500
Subject: [PATCH] remove salt repo files created by saltbootstrap

---
 salt/common/soup_scripts.sls |  2 +-
 salt/salt/minion.sls         | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/salt/common/soup_scripts.sls b/salt/common/soup_scripts.sls
index c5b75b0f2..60215f949 100644
--- a/salt/common/soup_scripts.sls
+++ b/salt/common/soup_scripts.sls
@@ -114,7 +114,7 @@ copy_so-repo-sync_sbin:
 {%     if grains.os_family == 'Debian' %}
 {%       set saltrepofile = '/etc/apt/sources.list.d/salt.list' %}
 {%     endif %}
-remove_saltproject_io_repo:
+remove_saltproject_io_repo_manager:
   file.absent:
     - name: {{ saltrepofile }}
 {%   endif %}
diff --git a/salt/salt/minion.sls b/salt/salt/minion.sls
index a5953e8e1..ee7c1f14c 100644
--- a/salt/salt/minion.sls
+++ b/salt/salt/minion.sls
@@ -19,6 +19,17 @@ include:
 
 {% if INSTALLEDSALTVERSION|string != SALTVERSION|string %}
 
+{# this is added in 2.4.120 to remove salt repo files pointing to saltproject.io to accomodate the move to broadcom and new bootstrap-salt script #}
+{%   if salt['pkg.version_cmp'](GLOBALS.so_version, '2.4.120') == -1 %}
+{%     set saltrepofile = '/etc/yum.repos.d/salt.repo' %}
+{%     if grains.os_family == 'Debian' %}
+{%       set saltrepofile = '/etc/apt/sources.list.d/salt.list' %}
+{%     endif %}
+remove_saltproject_io_repo_minion:
+  file.absent:
+    - name: {{ saltrepofile }}
+{%   endif %}
+
 unhold_salt_packages:
   pkg.unheld:
     - pkgs: