Merge branch 'dev' of github.com:jstefanop/apolloapi-v2 into dev

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
 

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
 

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",