From 6cdc214582feca6ed6d7632526253a8a44865a41 Mon Sep 17 00:00:00 2001 From: Wes Lambert Date: Thu, 14 Oct 2021 15:33:37 +0000 Subject: [PATCH] Add pillar in setup and change name of EG variable --- setup/so-functions | 7 +++++++ setup/so-setup | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 4398cfbcc..3a1d05757 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1640,6 +1640,13 @@ manager_pillar() { printf '%s\n'\ " kratoskey: '$KRATOSKEY'"\ "" >> "$pillar_file" + + if [[ -n $ENDGAMEHOST ]]; then + printf '%s\n'\ + "soc:"\ + " endgamehost: '$ENDGAMEHOST'"\ + "" >> "$pillar_file" + fi } manager_global() { diff --git a/setup/so-setup b/setup/so-setup index 71401602e..95cf84b27 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -967,9 +967,9 @@ else so-learn enable logscan --apply >> $setup_log 2>&1 fi - if [[ -n $ENDGAME_SMP_IP ]]; then + if [[ -n $ENDGAMEHOST ]]; then set_progress_str 99 'Configuring firewall for Endgame SMP' - so-firewall --apply includehost endgame $ENDGAME_SMP_IP >> $setup_log 2>&1 + so-firewall --apply includehost endgame $ENDGAMEHOST >> $setup_log 2>&1 fi } | whiptail_gauge_post_setup "Running post-installation steps..."