Merge pull request #3804 from Security-Onion-Solutions/saltfix

Fix Repos by forcing removal

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: '*'

setup/so-functions

@@ -2285,14 +2285,22 @@ secrets_pillar(){
 
 securityonion_repo() {
 	# Remove all the current repos
-	if [[ "$OS" == "centos" && $is_airgap ]]; then
+	if [[ "$OS" == "centos" ]]; then
-	    mkdir -p /root/oldrepos
+	    if [[ "$INTERWEBS" == "AIRGAP" ]]; then
-	    mv /etc/yum.repos.d/* /root/oldrepos/
+		    echo "This is airgap I don't need to add this repo"
-		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/
+	        mkdir -p /root/oldrepos
+	        mv -v /etc/yum.repos.d/* /root/oldrepos/
+			ls -la /etc/yum.repos.d/
+		    rm -rf /etc/yum.repos.d
+			yum clean all
+			yum repolist all
+			mkdir -p /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"