From a82c4c24fbbb77f7dd6f96388b36219a7c32c000 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Mon, 17 Aug 2020 10:55:07 -0400
Subject: [PATCH] move url_base from manager to global in when running soup

---
 salt/common/tools/sbin/soup | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup
index 973a13eb7..f7e46e780 100755
--- a/salt/common/tools/sbin/soup
+++ b/salt/common/tools/sbin/soup
@@ -29,6 +29,7 @@ manager_check() {
   MANAGERCHECK=$(cat /etc/salt/grains | grep role | awk '{print $2}')
   if [[ "$MANAGERCHECK" =~ ^('so-eval'|'so-manager'|'so-standalone'|'so-managersearch'|'so-import')$ ]]; then
     echo "This is a manager. We can proceed."
+    MINIONID=$(salt-call grains.get id --out=txt|awk -F: {'print $2'}|tr -d ' ')
   else
     echo "Please run soup on the manager. The manager controls all updates."
     exit 0
@@ -97,8 +98,10 @@ pillar_changes() {
       mv -v /opt/so/saltstack/local/pillar/static.sls /opt/so/saltstack/local/pillar/global.sls >> "$SOUP_LOG" 2>&1
       sed -i '1c\global:' /opt/so/saltstack/local/pillar/global.sls >> "$SOUP_LOG" 2>&1
 
-      # Moving baseurl inside static.sls
-
+      # Moving baseurl from minion sls file to inside global.sls
+      local line=$(grep '^  url_base:' /opt/so/saltstack/local/pillar/minions/$MINIONID)
+      sed -i '/^  url_base:/d' /opt/so/saltstack/local/pillar/minions/$MINIONID;
+      sed -i "/^global:/a \\$line" /opt/so/saltstack/local/pillar/global.sls;
 
     fi
 }