tweak multinode-demo to work better in snap, validator-x be more stand-alone

This commit is contained in:
Rob Walker 2018-08-04 00:49:39 -07:00 committed by Grimes
parent dc9a11bae0
commit 40ea3e3e61
2 changed files with 3 additions and 2 deletions

View File

@ -163,8 +163,8 @@ tune_networking() {
SOLANA_CONFIG_DIR=${SNAP_DATA:-$PWD}/config
SOLANA_CONFIG_PRIVATE_DIR=${SNAP_DATA:-$PWD}/config-private
SOLANA_CONFIG_VALIDATOR_DIR=${SNAP_DATA:-$PWD}/config-validator
SOLANA_CONFIG_CLIENT_DIR=${SNAP_USER_DATA:-$PWD}/config-client
SOLANA_CONFIG_VALIDATOR_DIR=${SNAP_USER_DATA:-$PWD}/config-validator
rsync_url() { # adds the 'rsync://` prefix to URLs that need it
declare url="$1"

View File

@ -74,10 +74,11 @@ if ((!self_setup)); then
validator_json_path=$SOLANA_CONFIG_VALIDATOR_DIR/validator.json
SOLANA_LEADER_CONFIG_DIR=$SOLANA_CONFIG_VALIDATOR_DIR/leader-config
else
mkdir -p "$SOLANA_CONFIG_PRIVATE_DIR"
validator_id_path=$SOLANA_CONFIG_PRIVATE_DIR/validator-id-x$$.json
$solana_keygen -o "$validator_id_path"
mkdir -p "$SOLANA_CONFIG_VALIDATOR_DIR"
validator_json_path=$SOLANA_CONFIG_VALIDATOR_DIR/validator-x$$.json
$solana_fullnode_config --keypair="$validator_id_path" -l -b $((9000 + ($$ % 1000))) > "$validator_json_path"