Minor improvements to vm cluster scripts. (#292)

This commit is contained in:
Ravin Perera
2021-04-20 21:44:44 +05:30
committed by GitHub
parent 05e8077e5b
commit 23dac682d1
2 changed files with 12 additions and 10 deletions

View File

@@ -38,7 +38,7 @@ fi
contconfig=$(jq -r ".contracts[] | select(.name == \"${CONTRACT}\") | .config" $conf)
if [ "$contconfig" = "" ] || [ "$contconfig" = "{}" ]; then
# Apply default config.
contconfig="{\"user\": {\"port\": 8080}, \"mesh\":{ \"port\": 22860}, \"contract\": {\"roundtime\": 2000 }, \"log\":{\"loglevel\": \"dbg\", \"loggers\":[\"console\",\"file\"]}}"
contconfig="{\"user\": {\"port\": 8080}, \"mesh\":{ \"port\": 22860}, \"contract\": {\"roundtime\": 2000 }, \"log\":{\"loglevel\": \"inf\", \"loggers\":[\"console\",\"file\"]}}"
fi
vmpass=$(jq -r '.vmpass' $conf)
@@ -73,7 +73,7 @@ fi
# reboot - Reboot specified vm node.
# ssh - Open up an ssh terminal for the specified vm node.
# dns - Uploads given zerossl domain verification file to vm and starts http server for DNS check.
# ssl - Uploads matching zerossl certificate bundle from ~/Downloads/ to the contract.
# ssl - Uploads matching zerossl certificate bundle from ~/downloads/ to the contract.
# lcl - Displays the lcls of all nodes.
# pubkey - Displays the pubkey on specified vm node or entire cluster.
@@ -207,9 +207,10 @@ if [ $mode = "dns" ]; then
exit 1
fi
vmaddr=${vmaddrs[$nodeid]}
sshpass -p $vmpass ssh $vmuser@$vmaddr 'mkdir -p $basedir/web80/.well-known/pki-validation'
sshpass -p $vmpass ssh $vmuser@$vmaddr "mkdir -p $basedir/web80/.well-known/pki-validation"
sshpass -p $vmpass scp $3 $vmuser@$vmaddr:$basedir/web80/.well-known/pki-validation/
sshpass -p $vmpass ssh $vmuser@$vmaddr -t 'cd $basedir/web80 && sudo python -m SimpleHTTPServer 80'
sshpass -p $vmpass ssh $vmuser@$vmaddr "sudo apt-get install -y python"
sshpass -p $vmpass ssh $vmuser@$vmaddr -t "cd $basedir/web80 && sudo python -m SimpleHTTPServer 80"
exit 0
fi
@@ -220,18 +221,19 @@ if [ $mode = "ssl" ]; then
fi
vmaddr=${vmaddrs[$nodeid]}
unzip -d ~/Downloads/$vmaddr/ ~/Downloads/$vmaddr.zip || exit 1;
pushd ~/Downloads/$vmaddr > /dev/null 2>&1
sudo apt-get install -y unzip
unzip -d ~/downloads/$vmaddr/ ~/downloads/$vmaddr.zip || exit 1;
pushd ~/downloads/$vmaddr > /dev/null 2>&1
mkdir certs
cat certificate.crt <(echo) ca_bundle.crt > certs/tlscert.pem
mv private.key certs/tlskey.pem
popd > /dev/null 2>&1
echo "Sending tls certs to the contract..."
sshpass -p $vmpass scp ~/Downloads/$vmaddr/certs/* $vmuser@$vmaddr:$basedir/hpfiles/ssl/
sshpass -p $vmpass scp ~/downloads/$vmaddr/certs/* $vmuser@$vmaddr:$basedir/hpfiles/ssl/
sshpass -p $vmpass ssh $vmuser@$vmaddr cp -rf $basedir/hpfiles/ssl/* $contdir/cfg/
rm -r ~/Downloads/$vmaddr
rm -r ~/downloads/$vmaddr
echo "Done"
exit 0
fi

View File

@@ -23,7 +23,7 @@ else
echo "Installing NodeJs..."
sudo apt-get update
sudo apt-get -y install curl
curl -sL https://deb.nodesource.com/setup_13.x | sudo -E bash -
curl -sL https://deb.nodesource.com/setup_14.x | sudo -E bash -
sudo apt-get install -y nodejs
fi
@@ -84,7 +84,7 @@ if [ $mode = "new" ] || [ $mode = "reconfig" ]; then
# Create lcl.sh script
echo "max_shard_no=\$(ls -v $contdir/ledger_fs/seed/primary/ | tail -2 | head -1)" > $contdir/lcl.sh
echo "echo \"select seq_no, ledger_hash from ledger order by seq_no DESC limit 1;\" | sqlite3 $contdir/ledger_fs/seed/primary/\$max_shard_no/ledger.sqlite" >> $contdir/lcl.sh
echo "echo \"select seq_no || '-' || lower(hex(ledger_hash)) from ledger order by seq_no DESC limit 1;\" | sqlite3 file:$contdir/ledger_fs/seed/primary/\$max_shard_no/ledger.sqlite?mode=ro" >> $contdir/lcl.sh
sudo chmod +x $contdir/lcl.sh
# Configure .screenrc