diff --git a/apolloui b/apolloui index cb36e2a..f2ec08f 160000 --- a/apolloui +++ b/apolloui @@ -1 +1 @@ -Subproject commit cb36e2acf750bb5cfa0e6fdb459dd39846ec83f3 +Subproject commit f2ec08faad3fd084061ecadf8c84f24c42f8737c diff --git a/backend/install b/backend/install index 0ad7d06..407ef31 100644 --- a/backend/install +++ b/backend/install @@ -14,7 +14,7 @@ echo -e "${YELLOW} ---> Installing required system packages${NC}" apt-get update apt-get -y upgrade -DEBIAN_FRONTEND=noninteractive apt-get -y -q install htop iputils-ping zip unzip whois traceroute vim openssh-server curl git libssl-dev libxslt-dev libxml2-dev imagemagick libmagickwand-dev libreadline-dev zlib1g-dev libsqlite3-dev libpq-dev build-essential libxml2-dev build-essential libxslt1-dev zlib1g-dev python-dev vim git sudo iptables network-manager +DEBIAN_FRONTEND=noninteractive apt-get -y -q install htop net-tools iputils-ping zip unzip whois traceroute vim openssh-server curl git libssl-dev libxslt-dev libxml2-dev imagemagick libmagickwand-dev libreadline-dev zlib1g-dev libsqlite3-dev libpq-dev build-essential libxml2-dev build-essential libxslt1-dev zlib1g-dev python-dev vim git sudo iptables network-manager APOLLO_DIR=/opt/apolloapi diff --git a/backend/node.service b/backend/node.service index 0dea94f..776c649 100755 --- a/backend/node.service +++ b/backend/node.service @@ -6,11 +6,11 @@ After=multi-user.target Type=forking User=futurebit #Start: -ExecStart=/opt/apolloapi/node/node_start.sh -#WorkingDirectory=/opt/apolloapi/node +ExecStart=/opt/apolloapi/backend/node/node_start.sh +#WorkingDirectory=/opt/apolloapi/backend/node #Stop: TimeoutStartSec=300 -ExecStop=/opt/apolloapi/node/node_stop.sh +ExecStop=/opt/apolloapi/backend/node/node_stop.sh [Install] WantedBy=multi-user.target diff --git a/backend/node/node_start.sh b/backend/node/node_start.sh index 4e98009..ba0babe 100755 --- a/backend/node/node_start.sh +++ b/backend/node/node_start.sh @@ -1,3 +1,3 @@ #!/bin/bash -screen -dmS node /opt/apolloapi/node/bitcoind -datadir=/media/nvme/Bitcoin -conf=/opt/apolloapi/node/bitcoin.conf +screen -dmS node /opt/apolloapi/backend/node/bitcoind -datadir=/media/nvme/Bitcoin -conf=/opt/apolloapi/backend/node/bitcoin.conf diff --git a/src/server.js b/src/server.js index 39f4ab2..7294933 100644 --- a/src/server.js +++ b/src/server.js @@ -4,5 +4,5 @@ const app = require('./app') const port = config.get('server.port') app.listen(port, () => { - console.log(`Server listening on port ${port}`) + console.log(`ENV: ${process.env.NODE_ENV || 'dev'} - Server listening on port ${port}`) }) diff --git a/src/store/api/node/nodeStats.js b/src/store/api/node/nodeStats.js index 263e834..7b47e5a 100644 --- a/src/store/api/node/nodeStats.js +++ b/src/store/api/node/nodeStats.js @@ -1,4 +1,4 @@ -const { join } = require('path') + const { join } = require('path') const { exec } = require('child_process') const litecoin = require('litecoin'); @@ -65,7 +65,7 @@ module.exports = ({ define }) => { const litecoinClient = new litecoin.Client({ host: '127.0.0.1', - port: 9332, + port: 8332, user: 'futurebit', pass: 'futurebit', timeout: 30000,