From c58c1a494a8b33d68f55d260aad560eab516f42a Mon Sep 17 00:00:00 2001 From: Mike Reeves Date: Mon, 9 Dec 2019 12:21:17 -0500 Subject: [PATCH] top.sls troubleshooting --- setup/functions.sh | 1 - setup/so-setup.sh | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/functions.sh b/setup/functions.sh index 0a62249ed..a00cb7b25 100644 --- a/setup/functions.sh +++ b/setup/functions.sh @@ -1065,7 +1065,6 @@ salt_master_directories() { cp /root/SecurityOnion/pillar/* /opt/so/saltstack/pillar/ cp /root/SecurityOnion/salt/* /opt/so/saltstack/salt/ else - cp -R ../pillar/* /opt/so/saltstack/pillar/ cp -R ../salt/* /opt/so/saltstack/salt/ fi diff --git a/setup/so-setup.sh b/setup/so-setup.sh index e9c2a4076..23ee52cbe 100644 --- a/setup/so-setup.sh +++ b/setup/so-setup.sh @@ -188,6 +188,7 @@ if (whiptail_you_sure) ; then chown_salt_master >> $SETUPLOG 2>&1 es_heapsize >> $SETUPLOG 2>&1 ls_heapsize >> $SETUPLOG 2>&1 + exit echo -e "XXX\n25\nConfiguring Default Pillars... \nXXX" master_static >> $SETUPLOG 2>&1 echo "** Generating the master pillar **" >> $SETUPLOG