From ea7c8e1fd928a61f2c05d6b3ed09aa82e88cb994 Mon Sep 17 00:00:00 2001
From: Mike Reeves <mike.reeves@securityonionsolutions.com>
Date: Mon, 12 Sep 2022 15:43:18 -0400
Subject: [PATCH] Add more logging to setup process

---
 setup/so-functions | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/setup/so-functions b/setup/so-functions
index aae8261fd..72f703f08 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -822,7 +822,12 @@ copy_salt_master_config() {
 		logCmd "cp ../files/salt/master/master /etc/salt/master"
 		logCmd "cp ../files/salt/master/salt-master.service /usr/lib/systemd/system/salt-master.service"
 	fi
-
+	info "Copying pillar and salt files in '$temp_install_dir' to '$local_salt_dir'"
+	logCmd "cp -Rv '$temp_install_dir'/pillar/ '$local_salt_dir'/"
+	if [ -d "$temp_install_dir"/salt ] ; then
+		logCmd "cp -Rv '$temp_install_dir'/salt/ $local_salt_dir/"
+	fi
+	
 	# Restart the service so it picks up the changes
 	logCmd "systemctl daemon-reload"
 	logCmd "systemctl restart salt-master"