From 9577c3f59d4cc889f9caeaca9a7b8d6a0d043c09 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Fri, 21 Jun 2024 15:24:54 -0400 Subject: [PATCH] Make soup use reposync from the repo --- salt/common/tools/sbin/so-common | 5 +++++ salt/manager/tools/sbin/so-repo-sync | 5 ----- salt/manager/tools/sbin/soup | 5 ----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/salt/common/tools/sbin/so-common b/salt/common/tools/sbin/so-common index 8d4d9f8ab..05c47a6c1 100755 --- a/salt/common/tools/sbin/so-common +++ b/salt/common/tools/sbin/so-common @@ -31,6 +31,11 @@ if ! echo "$PATH" | grep -q "/usr/sbin"; then export PATH="$PATH:/usr/sbin" fi +# See if a proxy is set. If so use it. +if [ -f /etc/profile.d/so-proxy.sh ]; then + . /etc/profile.d/so-proxy.sh +fi + # Define a banner to separate sections banner="=========================================================================" diff --git a/salt/manager/tools/sbin/so-repo-sync b/salt/manager/tools/sbin/so-repo-sync index d7cdcc32d..a0393a36b 100755 --- a/salt/manager/tools/sbin/so-repo-sync +++ b/salt/manager/tools/sbin/so-repo-sync @@ -7,11 +7,6 @@ NOROOT=1 . /usr/sbin/so-common -# See if a proxy is set. If so use it. -if [ -f /etc/profile.d/so-proxy.sh ]; then - . /etc/profile.d/so-proxy.sh -fi - set -e curl --retry 5 --retry-delay 60 -A "reposync/$(sync_options)" https://sigs.securityonion.net/checkup --output /tmp/checkup diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup index f025edc30..63df4eb25 100755 --- a/salt/manager/tools/sbin/soup +++ b/salt/manager/tools/sbin/soup @@ -9,11 +9,6 @@ . /usr/sbin/so-common . /usr/sbin/so-image-common -# See if a proxy is set. If so use it. -if [ -f /etc/profile.d/so-proxy.sh ]; then - . /etc/profile.d/so-proxy.sh -fi - UPDATE_DIR=/tmp/sogh/securityonion DEFAULT_SALT_DIR=/opt/so/saltstack/default INSTALLEDVERSION=$(cat /etc/soversion)