From 739efc22d2f37c8c59e37a9772c41b9d1a7fad11 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Tue, 30 Nov 2021 15:21:44 -0500 Subject: [PATCH 1/3] Fix airgap check logic --- setup/so-setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/so-setup b/setup/so-setup index 1893d252b..159367793 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -318,7 +318,7 @@ if ! [[ -f $install_opt_file ]]; then elif [[ $is_minion && $is_iso ]]; then $sshcmd -i /root/.ssh/so.key soremote@"$MSRV" [[ -f /etc/yum.repos.d/airgap_repo.repo ]] >> $setup_log 2>&1 airgap_check=$? - [[ $airgap_check ]] && is_airgap=true >> $setup_log 2>&1 + [[ $airgap_check == 0 ]] && is_airgap=true >> $setup_log 2>&1 fi reset_proxy From 8d87fae6a87ada9e3c1b5edc7d0bcf7944efebec Mon Sep 17 00:00:00 2001 From: William Wernert Date: Tue, 30 Nov 2021 15:39:28 -0500 Subject: [PATCH 2/3] Remove airgap repo file if it shouldn't exist --- salt/repo/client/init.sls | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/salt/repo/client/init.sls b/salt/repo/client/init.sls index f6fbdb6f3..a32287332 100644 --- a/salt/repo/client/init.sls +++ b/salt/repo/client/init.sls @@ -65,6 +65,10 @@ yumconf: - mode: 644 - template: jinja - show_changes: False + +cleanairgap: + file.absent: + - name: /etc/yum.repos.d/airgap_repo.repo {% endif %} cleanyum: From 168f860c871aea656cd4d0660559a3a90f77c9c1 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Tue, 30 Nov 2021 15:49:41 -0500 Subject: [PATCH 3/3] Add hotfix string to HOTFIX --- HOTFIX | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HOTFIX b/HOTFIX index 0f3ca3c28..8f9b6cfec 100644 --- a/HOTFIX +++ b/HOTFIX @@ -1 +1 @@ -WAZUH +WAZUH AIRGAPFIX