From 091cc8b789e496c9938175aa87ad2f74168d48e9 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Thu, 28 May 2020 08:57:07 -0400
Subject: [PATCH] fix how local salt and pillar dirs are created -
 https://github.com/Security-Onion-Solutions/securityonion-saltstack/issues/749

---
 setup/so-functions | 21 ++++++++++++---------
 setup/so-variables |  2 ++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/setup/so-functions b/setup/so-functions
index 8606de688..c9397b94d 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -270,7 +270,7 @@ clear_master() {
 		{
 			echo "Clearing old master key";
 			rm -f /etc/salt/pki/minion/minion_master.pub;
-			sytemctl -q restart salt-minion;
+			systemctl -q restart salt-minion;
 		} >> "$setup_log" 2>&1
 	fi
 
@@ -454,14 +454,17 @@ copy_ssh_key() {
 }
 
 create_local_directories() {
-	echo "Creating local pillar and salt directories"
-
-	for i in "pillar" "salt"; do
-		for d in `find ../$i/ -type d`; do
-    		mkdir -p $local_salt_dir/$d
-      	done
-		chown -R socore:socore $local_salt_dir/$i
-    done
+        echo "Creating local pillar and salt directories"
+        PILLARSALTDIR=${SCRIPTDIR::-5}
+        for i in "pillar" "salt"; do
+                for d in `find $PILLARSALTDIR/$i -type d`; do
+						suffixdir=${d//$PILLARSALTDIR/}
+                        if [ ! -d "$local_salt_dir/$suffixdir" ]; then
+	                        mkdir -v "$local_salt_dir$suffixdir" >> "$setup_log" 2>&1
+                        fi
+                done
+                chown -R socore:socore "$local_salt_dir/$i"
+        done
 
 }
 
diff --git a/setup/so-variables b/setup/so-variables
index 7e0f71c8a..e14a955ab 100644
--- a/setup/so-variables
+++ b/setup/so-variables
@@ -37,3 +37,5 @@ export DEBIAN_FRONTEND=noninteractive
 
 export default_salt_dir=/opt/so/saltstack/default
 export local_salt_dir=/opt/so/saltstack/local
+
+export SCRIPTDIR=$(cd `dirname $0` && pwd)