diff --git a/install/generator-cyphernode/generators/app/help.json b/install/generator-cyphernode/generators/app/help.json index 36032e7..90deeb1 100644 --- a/install/generator-cyphernode/generators/app/help.json +++ b/install/generator-cyphernode/generators/app/help.json @@ -17,7 +17,7 @@ "gatekeeper_edit_apiproperties": "If you know what you are doing, it is possible to manually edit the API endpoints/groups authorization. (Not recommended)", "gatekeeper_apiproperties": "You are about to edit the api.properties file. The format of the file is pretty simple: for each action, you will find what access group can access it. Admin group can do what Spender group can, and Spender group can do what Watcher group can. Internal group is for the endpoints accessible only within the Docker network, like the backoffice tasks used by the Cron container. The access groups for each API id/key are found in the keys.properties file.", "gatekeeper_cns": "I use domain names and/or IP addresses to create valid TLS certificates. For example, if https://cyphernodehost/getbestblockhash and https://192.168.7.44/getbestblockhash will be used, enter cyphernodehost, 192.168.7.44 as a possible domains. 127.0.0.1, localhost, gatekeeper will be automatically added to your list. Make sure the provided domain names are in your DNS or client's hosts file and is reachable.", - "bitcoin_mode": "Cyphernode can spawn a new Bitcoin Core full node for its own use. But if you already have a Bitcoin Core node running, Cyphernode can use that.", + "bitcoin_mode": "Cyphernode will spawn a new Bitcoin Core full node for its own use. If you already have Bitcoin Core node data, you can use the directory containing that data directly or copy the contents of it to a new directory to be used by cyphernode. Be aware that the files might change ownership, if you run cyphernode as a different user. In case you want to move the blockchain data to another node you might need to change the owner to fit the configuration of that node.", "bitcoin_node_ip": "Cyphernode uses Bitcoin Core RPC interface for its tasks. Please provide the IP address of your current Bitcoin Core node.", "bitcoin_rpcuser": "Bitcoin Core's RPC username used by Cyphernode when calling the node.", "bitcoin_rpcpassword": "Bitcoin Core's RPC password used by Cyphernode when calling the node.", diff --git a/install/generator-cyphernode/generators/app/prompters/900_bitcoin.js b/install/generator-cyphernode/generators/app/prompters/900_bitcoin.js index faf1543..9983e68 100644 --- a/install/generator-cyphernode/generators/app/prompters/900_bitcoin.js +++ b/install/generator-cyphernode/generators/app/prompters/900_bitcoin.js @@ -32,15 +32,11 @@ module.exports = { type: 'list', name: 'bitcoin_mode', default: utils._getDefault( 'bitcoin_mode' ), - message: prefix()+'Where is your bitcoin full node running?'+utils._getHelp('bitcoin_mode'), + message: prefix()+'Cyphernode will manage your bitcoin full node.'+utils._getHelp('bitcoin_mode'), choices: [ { - name: 'Nowhere! I want cyphernode to run one.', + name: 'Ok. That is awesome', value: 'internal' - }, - { - name: 'I have a full node running.', - value: 'external' } ] }, diff --git a/install/generator-cyphernode/generators/app/templates/bitcoin/bitcoin.conf b/install/generator-cyphernode/generators/app/templates/bitcoin/bitcoin.conf index 62462b7..f73a7f4 100644 --- a/install/generator-cyphernode/generators/app/templates/bitcoin/bitcoin.conf +++ b/install/generator-cyphernode/generators/app/templates/bitcoin/bitcoin.conf @@ -3,7 +3,7 @@ testnet=1 <% } %> -<% if (bitcoin_prune) { %> +<% if (bitcoin_prune && bitcoin_mode === 'internal') { %> prune=<%= bitcoin_prune_size || 550 %> <% } else { %> txindex=1