CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-08 02:02:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove salt repo files created by saltbootstrap

Browse Source
This commit is contained in:
m0duspwnens
2024-11-12 11:31:42 -05:00
parent 9e5d0e88de
commit 33fdc23965
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/common/soup_scripts.sls
View File

@@ -114,7 +114,7 @@ copy_so-repo-sync_sbin:
{% if grains.os_family == 'Debian' %} {% if grains.os_family == 'Debian' %}
{% set saltrepofile = '/etc/apt/sources.list.d/salt.list' %} {% set saltrepofile = '/etc/apt/sources.list.d/salt.list' %}
{% endif %} {% endif %}
remove_saltproject_io_repo: remove_saltproject_io_repo_manager:
file.absent: file.absent:
- name: {{ saltrepofile }} - name: {{ saltrepofile }}
{% endif %} {% endif %}

11
salt/salt/minion.sls
View File

@@ -19,6 +19,17 @@ include:
{% if INSTALLEDSALTVERSION|string != SALTVERSION|string %} {% 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: unhold_salt_packages:
pkg.unheld: pkg.unheld:
- pkgs: - pkgs: