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

Merge pull request #10631 from Security-Onion-Solutions/2.4/repos

Browse Source 
2.4/repos
This commit is contained in:
Josh Patterson
2023-06-21 16:06:30 -04:00
committed by GitHub
parent 139b36b189 4e849ecc90
commit ad4fb52b81
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
salt/repo/client/files/rocky/yum.conf.jinja
View File

@@ -12,6 +12,6 @@ installonly_limit={{ salt['pillar.get']('yum:config:installonly_limit', 2) }}
bugtracker_url=http://bugs.centos.org/set_project.php?project_id=23&ref=http://bugs.centos.org/bug_report_page.php?category=yum bugtracker_url=http://bugs.centos.org/set_project.php?project_id=23&ref=http://bugs.centos.org/bug_report_page.php?category=yum
distroverpkg=centos-release distroverpkg=centos-release
clean_requirements_on_remove=1 clean_requirements_on_remove=1
{% if proxy -%} {%- if proxy %}
proxy={{ proxy }} proxy={{ proxy }}
{% endif %} {%- endif %}

4
salt/repo/client/map.jinja
View File

@@ -11,6 +11,10 @@
'Rocky-Sources.repo', 'Rocky-Sources.repo',
'Rocky-Vault.repo', 'Rocky-Vault.repo',
'Rocky-x86_64-kernel.repo', 'Rocky-x86_64-kernel.repo',
'rocky-addons.repo',
'rocky-devel.repo',
'rocky-extras.repo',
'rocky.repo',
'docker-ce.repo', 'docker-ce.repo',
'epel.repo', 'epel.repo',
'epel-testing.repo', 'epel-testing.repo',

7
setup/so-functions
View File

@@ -2402,7 +2402,12 @@ update_sudoers_for_testing() {
update_packages() { update_packages() {
if [[ $is_rocky ]]; then if [[ $is_rocky ]]; then
logCmd "dnf repolist" logCmd "dnf repolist"
logCmd "dnf -y update --allowerasing --exclude=salt*,wazuh*,docker*,containerd*" logCmd "dnf -y update --allowerasing --exclude=salt*,docker*,containerd*"
RMREPOFILES=("rocky-addons.repo" "rocky-devel.repo" "rocky-extras.repo" "rocky.repo")
info "Removing repo files added by rocky-repos package update"
for FILE in ${RMREPOFILES[@]}; do
logCmd "rm -f /etc/yum.repos.d/$FILE"
done
else else
info "Running apt-get update" info "Running apt-get update"
retry 150 10 "apt-get -y update" "" "Err:" >> "$setup_log" 2>&1 || fail_setup retry 150 10 "apt-get -y update" "" "Err:" >> "$setup_log" 2>&1 || fail_setup