From a52ee063e597b010df8996fd02423598570fd9a6 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Wed, 18 Oct 2023 16:35:33 -0400 Subject: [PATCH] use generate_ca and generate_ssl functions and move them up --- setup/so-setup | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/setup/so-setup b/setup/so-setup index 052111591..73ef29f4b 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -718,7 +718,7 @@ if ! [[ -f $install_opt_file ]]; then # this is done before the salt.master state puts the checkmine engine in place and starts # checking for a valid ca in the mine for the manager # the minion ip will already be in the mine from configure_minion function in so-functions - logCmd "salt-call state.apply ca" + generate_ca # this will apply the salt.minion state first since salt.master includes salt.minion logCmd "salt-call state.apply salt.master" # wait here until we get a response from the salt-master since it may have just restarted @@ -727,6 +727,7 @@ if ! [[ -f $install_opt_file ]]; then # this will also call the ssl state since docker requires the intca # the salt-minion service will need to be up on the manager to sign requests + generate_ssl logCmd "salt-call state.apply docker" firewall_generate_templates set_initial_firewall_policy @@ -734,8 +735,6 @@ if ! [[ -f $install_opt_file ]]; then title "Downloading Elastic Agent Artifacts" download_elastic_agent_artifacts - generate_ca - generate_ssl logCmd "salt-call state.apply -l info firewall" # create these so the registry state can add so-registry to /opt/so/conf/so-status/so-status.conf