From df5901a65d0da065af2ecee857c5967a2a922046 Mon Sep 17 00:00:00 2001 From: weslambert Date: Fri, 12 Nov 2021 12:16:26 -0500 Subject: [PATCH 1/3] Adjust how manager pillar is populated for ENDGAME and default SOC config --- setup/so-functions | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 3f48cbd78..142bb070f 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1637,12 +1637,13 @@ manager_pillar() { printf '%s\n'\ " kratoskey: '$KRATOSKEY'"\ "" >> "$pillar_file" - + printf '%s\n'\ + "soc:"\ + " es_index_patterns: '*:so-*,*:endgame-*'"\ + "" >> "$pillar_file" if [[ -n $ENDGAMEHOST ]]; then printf '%s\n'\ - "soc:"\ " endgamehost: '$ENDGAMEHOST'"\ - " es_index_patterns: '*:so-*,*:endgame-*'"\ "" >> "$pillar_file" fi } From bc2e470da974d8f99b80ceedc9b2a8d649ed3d6b Mon Sep 17 00:00:00 2001 From: weslambert Date: Fri, 12 Nov 2021 12:20:00 -0500 Subject: [PATCH 2/3] Fix indentation --- setup/so-functions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 142bb070f..6368e0287 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1638,9 +1638,9 @@ manager_pillar() { " kratoskey: '$KRATOSKEY'"\ "" >> "$pillar_file" printf '%s\n'\ - "soc:"\ - " es_index_patterns: '*:so-*,*:endgame-*'"\ - "" >> "$pillar_file" + "soc:"\ + " es_index_patterns: '*:so-*,*:endgame-*'"\ + "" >> "$pillar_file" if [[ -n $ENDGAMEHOST ]]; then printf '%s\n'\ " endgamehost: '$ENDGAMEHOST'"\ From 9141c271f05c1375a7a5fb3ba1eef5bb920c5312 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Fri, 12 Nov 2021 12:25:32 -0500 Subject: [PATCH 3/3] Fix indent --- setup/so-functions | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 6368e0287..3bff5d542 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -1637,14 +1637,14 @@ manager_pillar() { printf '%s\n'\ " kratoskey: '$KRATOSKEY'"\ "" >> "$pillar_file" - printf '%s\n'\ + printf '%s\n'\ "soc:"\ " es_index_patterns: '*:so-*,*:endgame-*'"\ - "" >> "$pillar_file" - if [[ -n $ENDGAMEHOST ]]; then - printf '%s\n'\ - " endgamehost: '$ENDGAMEHOST'"\ - "" >> "$pillar_file" + "" >> "$pillar_file" + if [[ -n $ENDGAMEHOST ]]; then + printf '%s\n'\ + " endgamehost: '$ENDGAMEHOST'"\ + "" >> "$pillar_file" fi }