update location of yum keys and repo files for setup

This commit is contained in:
m0duspwnens
2021-04-13 11:15:15 -04:00
parent 325264dafd
commit eb94c011e2
2 changed files with 4 additions and 4 deletions

View File

@@ -165,9 +165,9 @@ get_random_value() {
gpg_rpm_import() { gpg_rpm_import() {
if [[ "$OS" == "centos" ]]; then if [[ "$OS" == "centos" ]]; then
if [[ "$WHATWOULDYOUSAYYAHDOHERE" == "setup" ]]; then if [[ "$WHATWOULDYOUSAYYAHDOHERE" == "setup" ]]; then
local RPMKEYSLOC="../salt/common/keys" local RPMKEYSLOC="../salt/repo/client/files/centos/keys"
else else
local RPMKEYSLOC="$UPDATEDIR/salt/common/keys" local RPMKEYSLOC="$UPDATEDIR/salt/repo/client/files/centos/keys"
fi fi
RPMKEYS=('RPM-GPG-KEY-EPEL-7' 'GPG-KEY-WAZUH' 'docker.pub' 'SALTSTACK-GPG-KEY.pub' 'securityonion.pub') RPMKEYS=('RPM-GPG-KEY-EPEL-7' 'GPG-KEY-WAZUH' 'docker.pub' 'SALTSTACK-GPG-KEY.pub' 'securityonion.pub')

View File

@@ -2300,9 +2300,9 @@ securityonion_repo() {
yum repolist all yum repolist all
mkdir -p /etc/yum.repos.d mkdir -p /etc/yum.repos.d
if [[ ! $is_manager && "$MANAGERUPDATES" == "1" ]]; then if [[ ! $is_manager && "$MANAGERUPDATES" == "1" ]]; then
cp -f ../salt/common/yum_repos/securityonioncache.repo /etc/yum.repos.d/ cp -f ../salt/repo/client/files/centos/securityonioncache.repo /etc/yum.repos.d/
else else
cp -f ../salt/common/yum_repos/securityonion.repo /etc/yum.repos.d/ cp -f ../salt/repo/client/files/centos/securityonion.repo /etc/yum.repos.d/
fi fi
fi fi
else else