merge with master

salt/common/tools/sbin/soup

@@ -846,8 +846,7 @@ apply_hotfix() {
   if [[ "$INSTALLEDVERSION" == "2.3.90" && "$HOTFIXVERSION" == "WAZUH" ]] ; then
     FILE="/nsm/wazuh/etc/ossec.conf"
     echo "Detecting if ossec.conf needs corrected..."
-    WAZUHHEADER=$(head -1 $FILE | grep "xml version")
-    if [[ ! -z "$WAZUHHEADER" ]]; then
+    if head -1 $FILE | grep -q "xml version"; then
       echo "$FILE has an XML header; removing"
       sed -i 1d $FILE
       so-wazuh-restart

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: