Merge pull request #11190 from Security-Onion-Solutions/failreposync

Failreposync
Security-Onion-Solutions · Aug 28, 2023 · 4f8a0c4 · 4f8a0c4
2 parents 2616a2b + 6b0fbe4
commit 4f8a0c4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/salt/common/soup_scripts.sls b/salt/common/soup_scripts.sls
@@ -19,4 +19,5 @@ soup_manager_scripts:
     - source: salt://manager/tools/sbin
     - include_pat:
         - so-firewall
-        - soup
+        - so-repo-sync
+        - soup
diff --git a/salt/manager/tools/sbin/so-repo-sync b/salt/manager/tools/sbin/so-repo-sync
@@ -11,6 +11,8 @@ set_version
 set_os
 salt_minion_count
 
+set -e
+
 curl --retry 5 --retry-delay 60 -A "reposync/$VERSION/$OS/$(uname -r)/$MINIONCOUNT" https://sigs.securityonion.net/checkup --output /tmp/checkup
 dnf reposync --norepopath -g --delete -m -c /opt/so/conf/reposync/repodownload.conf --repoid=securityonionsync --download-metadata -p /nsm/repo/
-createrepo /nsm/repo	
+createrepo /nsm/repo
diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
@@ -440,7 +440,7 @@ post_to_2.4.20() {
 
 repo_sync() {
   echo "Sync the local repo."
-  su socore -c '/usr/sbin/so-repo-sync'
+  su socore -c '/usr/sbin/so-repo-sync' || fail "Unable to complete so-repo-sync."
 }
 
 stop_salt_master() {