From 93493b204fcbde9a49a50ab81041bbdb36ac9a68 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Wed, 29 Apr 2020 18:15:21 -0400 Subject: [PATCH] [fix] Add new whitespace --- setup/so-functions | 8 ++++++-- setup/so-setup | 1 + setup/so-whiptail | 2 -- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/setup/so-functions b/setup/so-functions index 9b2996608..4ad53c32f 100755 --- a/setup/so-functions +++ b/setup/so-functions @@ -764,6 +764,7 @@ master_pillar() { " ls_batch_count: 125"\ " mtu: $MTU" >> "$pillar_file" fi + printf '%s\n'\ " lsheap: $LS_HEAP_SIZE"\ " lsaccessip: 127.0.0.1"\ @@ -1125,9 +1126,12 @@ salt_checkin() { salt-call state.apply ca; salt-call state.apply ssl; } >> "$setup_log" 2>&1 - ;; esac + { + salt-call state.apply ca; + salt-call state.apply ssl; + } >> "$setup_log" 2>&1 } # FIXME: should this be a function? @@ -1434,4 +1438,4 @@ es_heapsize() { NODE_ES_HEAP_SIZE=ES_HEAP_SIZE export NODE_ES_HEAP_SIZE fi -} \ No newline at end of file +} diff --git a/setup/so-setup b/setup/so-setup index d53a8a174..3874ff3fd 100755 --- a/setup/so-setup +++ b/setup/so-setup @@ -233,6 +233,7 @@ if [[ $is_node && ! $is_eval ]]; then fi whiptail_make_changes + set_hostname 2>> "$setup_log" set_version 2>> "$setup_log" clear_master 2>> "$setup_log" diff --git a/setup/so-whiptail b/setup/so-whiptail index 76fcaf3bd..825430272 100755 --- a/setup/so-whiptail +++ b/setup/so-whiptail @@ -295,8 +295,6 @@ whiptail_enable_components() { for component in "${COMPONENTS[@]}"; do export "$component=1" done - - } whiptail_eval_adv() {