From 3c93f9fd4558c26aa2799473eb917f5ab7208a50 Mon Sep 17 00:00:00 2001
From: Josh Brower <Josh@Defensivedepth.com>
Date: Thu, 2 Jul 2020 05:30:30 -0400
Subject: [PATCH] Playbook setup fix

---
 setup/so-setup | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/setup/so-setup b/setup/so-setup
index 2ceb06a0a..3f3759012 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -518,14 +518,19 @@ fi
 	fi
 
 	if [[ "$PLAYBOOK" = 1 ]]; then
+		set_progress_str 73 "$(print_salt_state_apply 'mysql')"
+		salt-call state.apply -l info mysql >> $setup_log 2>&1
+		
 		set_progress_str 73 "$(print_salt_state_apply 'playbook')"
 		salt-call state.apply -l info playbook >> $setup_log 2>&1
 		so-playbook-ruleupdate >> /root/setup_playbook_rule_update.log 2>&1 &
 	fi
 	
 	if [[ "$OSQUERY" = 1 ]]; then
+		if [[ "$PLAYBOOK" != 1 ]]; then
 		set_progress_str 74 "$(print_salt_state_apply 'mysql')"
 		salt-call state.apply -l info mysql >> $setup_log 2>&1
+		fi
 
 		set_progress_str 75 "$(print_salt_state_apply 'fleet')"
 		salt-call state.apply -l info fleet >> $setup_log 2>&1