From a637b0e61b53976a15035f225197e01f12de50d4 Mon Sep 17 00:00:00 2001
From: m0duspwnens <josh.patterson@securityonionsolutions.com>
Date: Mon, 16 Oct 2023 14:58:58 -0400
Subject: [PATCH] apply salt.master and minion state early in setup to prevent
 the services from restarting later in setup

---
 setup/so-setup | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/setup/so-setup b/setup/so-setup
index 60296d2f3..dc209b756 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -714,6 +714,7 @@ if ! [[ -f $install_opt_file ]]; then
 
 		logCmd "salt-call state.apply common.packages"
 		logCmd "salt-call state.apply common"
+		logCmd "salt-call state.apply salt.master"
 		logCmd "salt-call state.apply docker"
 		firewall_generate_templates
 		set_initial_firewall_policy
@@ -768,8 +769,6 @@ if ! [[ -f $install_opt_file ]]; then
 		checkin_at_boot
 		set_initial_firewall_access
 		logCmd "salt-call schedule.enable -linfo --local"
-		systemctl restart salt-master
-		systemctl restart salt-minion
 		verify_setup
 	else
 		touch /root/accept_changes