From 3b30be73b797c2e980df8ef22b621ceb74674110 Mon Sep 17 00:00:00 2001 From: bill bittner Date: Thu, 13 Jul 2017 22:21:18 -0700 Subject: [PATCH] updated env variables --- README.md | 6 +++--- config/custom-environment-variables.json | 4 +--- config/default.json | 4 +--- config/development.json | 4 +--- config/production.json | 4 +--- config/test.json | 4 +--- helpers/libraries/publishHelpers.js | 2 -- 7 files changed, 8 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index f63d060d..6fe512a1 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,9 @@ spee.ch is a single-serving site that reads and publishes images to and from the * clone this repo * customize `config/develpment.json` by replacing the value of `Database.DownloadDirectory` with a string representing the local path where you want uploaded files to be stored. * run `npm install` -* to start the server, from your command line run `node server.js` while passing three environmental variables: your lbry wallet address (`LBRY_WALLET_ADDRESS`), your mysql connection uri (`MYSQL_CONNECTION_STRING`), and the environment to run (`NODE_ENV`). - * i.e. `LBRY_WALLET_ADDRESS= MYSQL_CONNECTION_STRING= NODE_ENV=development node server.js` - * e.g. `LBRY_WALLET_ADDRESS=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX MYSQL_CONNECTION_STRING=mysql://root:XXXXXX@localhost:3306/lbry NODE_ENV=development node server.js` +* to start the server, from your command line run `node server.js` while passing three environmental variables: your lbry wallet address (`LBRY_CLAIM_ADDRESS`), your mysql connection uri (`MYSQL_CONNECTION_STRING`), and the environment to run (`NODE_ENV`). + * i.e. `LBRY_CLAIM_ADDRESS= MYSQL_CONNECTION_STRING= NODE_ENV=development node server.js` + * e.g. `LBRY_CLAIM_ADDRESS=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX MYSQL_CONNECTION_STRING=mysql://root:XXXXXX@localhost:3306/lbry NODE_ENV=development node server.js` * To run hot, use `nodemon` instead of `node` * visit [localhost:3000](http://localhost:3000) diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json index aa3fad52..12cae61a 100644 --- a/config/custom-environment-variables.json +++ b/config/custom-environment-variables.json @@ -1,8 +1,6 @@ { "WalletConfig": { - "LbryPayAddress": "LBRY_PAY_ADDRESS", - "LbryClaimAddress": "LBRY_CLAIM_ADDRESS", - "LbryChangeAddress": "LBRY_CHANGE_ADDRESS" + "LbryClaimAddress": "LBRY_CLAIM_ADDRESS" }, "Database": { "MySqlConnectionUri": "MYSQL_CONNECTION_STRING" diff --git a/config/default.json b/config/default.json index 1149f468..11140fef 100644 --- a/config/default.json +++ b/config/default.json @@ -1,8 +1,6 @@ { "WalletConfig": { - "LbryPayAddress": "none", - "LbryClaimAddress": "none", - "LbryChangeAddress": "none" + "LbryClaimAddress": "none" }, "AnalyticsConfig":{ "GoogleId": "none" diff --git a/config/development.json b/config/development.json index 81f05f1f..34c4c849 100644 --- a/config/development.json +++ b/config/development.json @@ -1,8 +1,6 @@ { "WalletConfig": { - "LbryPayAddress": "none", - "LbryClaimAddress": "none", - "LbryChangeAddress": "none" + "LbryClaimAddress": "none" }, "AnalyticsConfig":{ "GoogleId": "UA-100747990-1" diff --git a/config/production.json b/config/production.json index 9dc93f55..d5f9e903 100644 --- a/config/production.json +++ b/config/production.json @@ -1,8 +1,6 @@ { "WalletConfig": { - "LbryPayAddress": "none", - "LbryClaimAddress": "none", - "LbryChangeAddress": "none" + "LbryClaimAddress": "none" }, "AnalyticsConfig":{ "GoogleId": "UA-60403362-3" diff --git a/config/test.json b/config/test.json index d53960e1..22e9f419 100644 --- a/config/test.json +++ b/config/test.json @@ -1,8 +1,6 @@ { "WalletConfig": { - "LbryPayAddress": "none", - "LbryClaimAddress": "none", - "LbryChangeAddress": "none" + "LbryClaimAddress": "none" }, "AnalyticsConfig":{ "GoogleId": "UA-100747990-1" diff --git a/helpers/libraries/publishHelpers.js b/helpers/libraries/publishHelpers.js index 0977d01a..460aab09 100644 --- a/helpers/libraries/publishHelpers.js +++ b/helpers/libraries/publishHelpers.js @@ -52,9 +52,7 @@ module.exports = { }, createPublishParams (name, filePath, license, nsfw) { logger.debug(`Creating Publish Parameters for "${name}"`); - // const payAddress = config.get('WalletConfig.LbryPayAddress'); const claimAddress = config.get('WalletConfig.LbryClaimAddress'); - // const changeAddress = config.get('WalletConfig.LbryChangeAddress'); // filter nsfw and ensure it is a boolean if (nsfw === false) { nsfw = false;