From 1c295a5f2ec19eda01900167c4720519546d8b56 Mon Sep 17 00:00:00 2001 From: Jeffrey Paul Date: Sat, 27 Aug 2016 02:54:16 +0200 Subject: [PATCH] updated for seed/miner split --- Makefile | 1 + steemd.run | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 4f56948..05c44bb 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,7 @@ build: kill run: kill docker run \ --name sneak-steemd \ + -e STEEMD_MINING_THREADS=$(STEEMD_MINING_THREADS) \ -e STEEMD_WITNESS_NAME=$(STEEMD_WITNESS_NAME) \ -e STEEMD_MINER_NAME=$(STEEMD_MINER_NAME) \ -e STEEMD_PRIVATE_KEY=$(STEEMD_PRIVATE_KEY) \ diff --git a/steemd.run b/steemd.run index 54326ac..8eb55e6 100644 --- a/steemd.run +++ b/steemd.run @@ -18,10 +18,20 @@ SEED_NODES=" seed.steemwitness.com:2001 steem-seed1.abit-more.com:2001 " + ARGS="" -for NODE in $SEED_NODES ; do - ARGS+=" --seed-node=$NODE" -done + +if [[ -z "$STEEMD_SEED_NODES" ]]; then + for NODE in $SEED_NODES ; do + ARGS+=" --seed-node=$NODE" + done +fi + +if [[ ! -z "$STEEMD_SEED_NODES" ]]; then + for NODE in $STEEMD_SEED_NODES ; do + ARGS+=" --seed-node=$NODE" + done +fi if [[ ! -z "$STEEMD_WITNESS_NAME" ]]; then ARGS+=" --witness=\"$STEEMD_WITNESS_NAME\"" @@ -29,14 +39,13 @@ fi if [[ ! -z "$STEEMD_MINER_NAME" ]]; then ARGS+=" --miner=[\"$STEEMD_MINER_NAME\",\"$STEEMD_PRIVATE_KEY\"]" + ARGS+=" --mining-threads=${STEEMD_MINING_THREADS:-8}" fi if [[ ! -z "$STEEMD_PRIVATE_KEY" ]]; then ARGS+=" --private-key=$STEEMD_PRIVATE_KEY" fi -ARGS+=" --mining-threads=${STEEMD_MINING_THREADS:-8}" - # without --data-dir it uses cwd as datadir(!) # who knows what else it dumps into current dir cd $HOME