From 725320ebc8880629f3c2550a21e55b1ba3785e52 Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Thu, 8 Apr 2021 10:02:11 -0400 Subject: [PATCH] Fix Repo Logic --- salt/common/init.sls | 2 +- setup/so-functions | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/salt/common/init.sls b/salt/common/init.sls index 9ee126ac1..93f76c3b3 100644 --- a/salt/common/init.sls +++ b/salt/common/init.sls @@ -309,7 +309,7 @@ sostatusdir: /usr/sbin/so-status -q && echo $? > /opt/so/log/sostatus/status.log 2>&1: cron.present: - user: root - - minute: '*/15' + - minute: '*/5' - hour: '*' - daymonth: '*' - month: '*' diff --git a/setup/so-functions b/setup/so-functions index 9aca9ca54..54f8d2abf 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -2285,14 +2285,18 @@ secrets_pillar(){ securityonion_repo() { # Remove all the current repos - if [[ "$OS" == "centos" && $is_airgap ]]; then - mkdir -p /root/oldrepos - mv /etc/yum.repos.d/* /root/oldrepos/ - rm -f /etc/yum.repos.d/* - if [[ ! $is_manager && "$MANAGERUPDATES" == "1" ]]; then - cp -f ../salt/common/yum_repos/securityonioncache.repo /etc/yum.repos.d/ + if [[ "$OS" == "centos" ]]; then + if [[ "$INTERWEBS" == "AIRGAP" ]]; then + echo "This is airgap I don't need to add this repo" else - cp -f ../salt/common/yum_repos/securityonion.repo /etc/yum.repos.d/ + mkdir -p /root/oldrepos + mv /etc/yum.repos.d/* /root/oldrepos/ + rm -f /etc/yum.repos.d/* + if [[ ! $is_manager && "$MANAGERUPDATES" == "1" ]]; then + cp -f ../salt/common/yum_repos/securityonioncache.repo /etc/yum.repos.d/ + else + cp -f ../salt/common/yum_repos/securityonion.repo /etc/yum.repos.d/ + fi fi else echo "This is Ubuntu"