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 #11670 from Security-Onion-Solutions/fix/soupagrepo

Browse Source 
Fix/soupagrepo
This commit is contained in:
Josh Patterson
2023-11-01 10:36:17 -04:00
committed by GitHub
parent ebf982bf86 4d7b1095b7
commit 59328d3909
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
salt/manager/tools/sbin/soup
View File

@@ -579,7 +579,7 @@ update_airgap_rules() {
rsync -av $UPDATE_DIR/agrules/* /nsm/repo/rules/ rsync -av $UPDATE_DIR/agrules/* /nsm/repo/rules/
} }
update_centos_repo() { update_airgap_repo() {
# Update the files in the repo # Update the files in the repo
echo "Syncing new updates to /nsm/repo" echo "Syncing new updates to /nsm/repo"
rsync -av $AGREPO/* /nsm/repo/ rsync -av $AGREPO/* /nsm/repo/
@@ -821,6 +821,7 @@ main() {
set -e set -e
if [[ $is_airgap -eq 0 ]]; then if [[ $is_airgap -eq 0 ]]; then
update_airgap_repo
yum clean all yum clean all
check_os_updates check_os_updates
elif [[ $OS == 'oracle' ]]; then elif [[ $OS == 'oracle' ]]; then
@@ -895,11 +896,6 @@ main() {
update_airgap_rules update_airgap_rules
fi fi
# Only update the repo if its airgap
if [[ $is_airgap -eq 0 && $UPGRADESALT -ne 1 ]]; then
update_centos_repo
fi
# since we don't run the backup.config_backup state on import we wont snapshot previous version states and pillars # since we don't run the backup.config_backup state on import we wont snapshot previous version states and pillars
if [[ ! "$MINIONID" =~ "_import" ]]; then if [[ ! "$MINIONID" =~ "_import" ]]; then
echo "" echo ""