From 89a86f134265d610acb2a286eb932fe670cdbfcd Mon Sep 17 00:00:00 2001 From: jstefanop Date: Wed, 3 Apr 2024 14:02:22 -0400 Subject: [PATCH 1/2] Installer/Updater Fixes --- backend/image_install | 8 ++++++-- backend/update_system | 10 ---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/backend/image_install b/backend/image_install index 6a86fdc..6e9f2b8 100644 --- a/backend/image_install +++ b/backend/image_install @@ -171,7 +171,7 @@ cp $APOLLO_DIR/backend/default-configs/bitcoin.conf $APOLLO_DIR/backend/node/ ### ckpool ### ######################### -#cp $APOLLO_DIR/backend/ckpool/bin/$arch/ckpool $APOLLO_DIR/backend/ckpool/ TODO UPDATE BINARIES +cp $APOLLO_DIR/backend/ckpool/bin/$arch/ckpool $APOLLO_DIR/backend/ckpool/ cp $APOLLO_DIR/backend/default-configs/ckpool.conf $APOLLO_DIR/backend/ckpool/ ### TOR ### @@ -218,6 +218,10 @@ systemctl daemon-reload echo -e "${GREEN} ---> Reloaded systemd daemon${NC}" +#Disable Tor service until started by user +systemctl stop tor.service +systemctl disable tor.service + # Enable and start the services systemctl enable apollo-api.service systemctl enable apollo-ui-v2.service @@ -225,7 +229,7 @@ systemctl enable swap.service systemctl enable rc-local.service systemctl enable apollo-miner.service systemctl enable node.service -systemctl enable ckpool.service + systemctl disable serial-getty@ttyS2.service diff --git a/backend/update_system b/backend/update_system index 5f6c226..270a975 100755 --- a/backend/update_system +++ b/backend/update_system @@ -30,16 +30,6 @@ cp $APOLLO_DIR/backend/ckpool/bin/$arch/ckpool $APOLLO_DIR/backend/ckpool/ cp $APOLLO_DIR/backend/default-configs/ckpool.conf $APOLLO_DIR/backend/ckpool/ -### Write back the Bitcoin RPC password on conf file -PASS=`sqlite3 $APOLLO_DIR/futurebit.sqlite "SELECT node_rpc_password FROM settings ORDER BY id DESC LIMIT 1;"` - -if [ -z "$PASS" ] -then - echo "Bitcoin password is empty will be generated by the app" -else - sed -i s/rpcpassword=futurebit/rpcpassword=${PASS}/ $APOLLO_DIR/backend/node/bitcoin.conf -fi - # Don't touch below this line echo "90" > $TMPFILE From f4b0164b8c6974d708492360d7f76def1f0c0f26 Mon Sep 17 00:00:00 2001 From: jstefanop Date: Wed, 3 Apr 2024 14:03:35 -0400 Subject: [PATCH 2/2] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bccc52d..bdf9ca3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "apolloapi-v2", - "version": "2.0.2", + "version": "2.0.3", "main": "index.js", "repository": "https://github.com/jstefanop/apolloapi-v2.git", "author": "FutureBit LLC",