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

Merge pull request #6955 from Security-Onion-Solutions/issue/6810

Browse Source 
Issue/6810
This commit is contained in:
Josh Patterson
2022-01-21 17:37:59 -05:00
committed by GitHub
parent 36fc25f78e 32080b02e4
commit 86cfa07af9
2 changed files with 7 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
salt/repo/client/files/centos/securityonioncache.repo
View File

@@ -42,14 +42,7 @@ gpgkey=https://repo.securityonion.net/file/securityonion-repo/keys/docker.pub
[saltstack] [saltstack]
name=SaltStack repo for RHEL/CentOS $releasever PY3 name=SaltStack repo for RHEL/CentOS $releasever PY3
baseurl=http://repocache.securityonion.net/file/securityonion-repo/saltstack3003/ baseurl=http://repocache.securityonion.net/file/securityonion-repo/saltstack/
enabled=1
gpgcheck=1
gpgkey=https://repo.securityonion.net/file/securityonion-repo/keys/SALTSTACK-GPG-KEY.pub
[saltstack3003]
name=SaltStack repo for RHEL/CentOS $releasever PY3
baseurl=http://repocache.securityonion.net/file/securityonion-repo/saltstack3003/
enabled=1 enabled=1
gpgcheck=1 gpgcheck=1
gpgkey=https://repo.securityonion.net/file/securityonion-repo/keys/SALTSTACK-GPG-KEY.pub gpgkey=https://repo.securityonion.net/file/securityonion-repo/keys/SALTSTACK-GPG-KEY.pub

12
setup/so-functions
View File

@@ -2343,17 +2343,17 @@ securityonion_repo() {
fi fi
# need to yum clean all before repo conf files are removed or clean,cleans nothing # need to yum clean all before repo conf files are removed or clean,cleans nothing
logCmd "yum -v clean all" logCmd "yum -v clean all"
# update this package before we remove repo config files because the repo config files get added back
# when the package is updated when the update_packages function is called
logCmd "yum -v -y -c $repo_conf_file update centos-release"
logCmd "mkdir -vp /root/oldrepos" logCmd "mkdir -vp /root/oldrepos"
logCmd "mv -v /etc/yum.repos.d/* /root/oldrepos/" logCmd "mv -v /etc/yum.repos.d/* /root/oldrepos/"
logCmd "ls -la /etc/yum.repos.d/" logCmd "ls -la /etc/yum.repos.d/"
logCmd "rm -vrf /etc/yum.repos.d"
logCmd "yum repolist all"
logCmd "mkdir -vp /etc/yum.repos.d"
logCmd "cp -f $repo_conf_file /etc/yum.repos.d/" logCmd "cp -f $repo_conf_file /etc/yum.repos.d/"
logCmd "yum repolist all" logCmd "yum repolist all"
# update this package because the repo config files get added back
# if the package is updated when the update_packages function is called
logCmd "yum -v -y update centos-release"
echo "Move the .repo files that were added by the centos-release package."
find /etc/yum.repos.d/ -type f -not -name 'securityonion*repo' -print0 | xargs -0 -I {} mv -bvf {} /root/oldrepos/
logCmd "yum repolist all"
fi fi
else else
echo "This is Ubuntu" echo "This is Ubuntu"