From ca0088975b8b0aa2204f593d17b4807bf1718b45 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Wed, 11 Dec 2024 22:00:03 +0000 Subject: [PATCH] revert --- lgsm/modules/install_config.sh | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/lgsm/modules/install_config.sh b/lgsm/modules/install_config.sh index 8aef8ea2f..ae395c205 100644 --- a/lgsm/modules/install_config.sh +++ b/lgsm/modules/install_config.sh @@ -183,23 +183,17 @@ fn_set_dst_config_vars() { sed -i "s/CLUSTERKEY/${randomstring}/g" "${clustercfgfullpath}" fn_sleep_time else - fn_print_skip_eol_nl + echo -e "${clustercfg} is already configured." + fn_script_log_info "${clustercfg} is already configured." fi - unset changes - randomstring=$(tr -dc A-Za-z0-9 < /dev/urandom 2> /dev/null | head -c 16 | xargs) - echo -en "generating cluster key" - changes="" - changes+=$(sed -i "s/CLUSTERKEY/${randomstring}/g w /dev/stdout" "${clustercfgfullpath}") - exitcode=$? - if [ "${exitcode}" -ne 0 ]; then - fn_print_fail_eol - fn_script_log_fail "generating cluster key" - elif [ "${changes}" != "" ]; then - fn_print_ok_eol_nl - fn_script_log_pass "generating cluster key" - else - fn_print_skip_eol_nl + ## server.ini + # removing unnecessary options (dependent on sharding & shard type). + if [ "${sharding}" == "false" ]; then + sed -i "s/ISMASTER//g" "${servercfgfullpath}" + sed -i "/SHARDNAME/d" "${servercfgfullpath}" + elif [ "${master}" == "true" ]; then + sed -i "/SHARDNAME/d" "${servercfgfullpath}" fi echo -e "changing shard name."