From e3e8d301615674e1d42b5b1cde882a5ec13038d8 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 17 Feb 2023 13:17:57 -0500 Subject: [PATCH] fix python docker name --- setup/so-functions | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index ba00ea5b7..b25561729 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -877,6 +877,7 @@ create_manager_pillars() { create_repo() { title "Create the repo directory" + logCmd "dnf -y install yum-utils" logCmd "createrepo /nsm/repo" } @@ -1949,14 +1950,6 @@ repo_sync_local() { echo "gpgcheck=1" >> /root/repodownload.conf echo "gpgkey=https://repo.securityonion.net/file/securityonion-repo/keys/securityonion.pub" >> /root/repodownload.conf - REPOSYNC=$(rpm -qa | grep yum-utils | wc -l) - if [[ ! "$REPOSYNC" -gt 0 ]]; then - # Install reposync - info "Installing yum-utils" - logCmd "dnf -y install -c /root/repodownload.conf yum-utils" - else - info "We have what we need to sync" - fi dnf repolist # Make sure we can get to the sig repo logCmd "curl --retry 5 --retry-delay 60 -A 'gridinstall/$SOVERSION/$OS/$(uname -r)/1' https://sigs.securityonion.net/checkup --output /tmp/checkup" @@ -1964,7 +1957,6 @@ repo_sync_local() { # Run it again and make sure we got allt he things logCmd "dnf reposync --norepopath -n -g --delete -m -c /root/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/" - # After the download is complete run createrepo create_repo @@ -2010,7 +2002,7 @@ saltify() { if [[ $is_rocky ]]; then # THIS IS A TEMP HACK - logCmd "dnf -y install securityonion-salt python3-chardet python3-idna python3-pysocks python3-requests python3-urllib3 python3-websocket-client python36-docker" + logCmd "dnf -y install securityonion-salt python3-chardet python3-idna python3-pysocks python3-requests python3-urllib3 python3-websocket-client python3-docker" logCmd "mkdir -p /etc/salt/minion.d" if [[ $waitforstate ]]; then # Since this is a salt master so let's install it