From 157d81fbe10a3bc29c17cdc2f0b620565dc2bd91 Mon Sep 17 00:00:00 2001 From: Ran Guin Date: Tue, 11 May 2021 18:48:51 -0700 Subject: move private keys to concise dedicated private config file --- .gitignore | 8 +++++--- config/samples/index.sample.js | 13 +++++++++---- config/samples/private.json | 33 +++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+), 7 deletions(-) create mode 100644 config/samples/private.json diff --git a/.gitignore b/.gitignore index 0ce09c75..5afc9479 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,6 @@ node_modules/ .env -config/config.json -config/index.js -config/lnurl.js +config/private.json config/clientversion yarn-error.log .pnp* @@ -17,3 +15,7 @@ verified data lnurl-server.sqlite3 watcher.log + +config/config.json +config/index.js +config/lnurl.js diff --git a/config/samples/index.sample.js b/config/samples/index.sample.js index aeda15c7..07d892b2 100644 --- a/config/samples/index.sample.js +++ b/config/samples/index.sample.js @@ -1,10 +1,12 @@ -const dbOptions = require("./config.json")[process.env.NODE_ENV || "development"]; +const private = require("./private.json") || {} +const debug = require('debug')('test') + let lnurl; try { lnurl = require("./lnurl"); } catch(e) { - l.warn("lnurl config not found"); + debug("lnurl config not found"); } const btcasset = "5ac9f65c0efcc4775e0baec4ec03abdde22473cd3cf33c0419ca290e0751b225"; @@ -20,7 +22,10 @@ module.exports = { "xxxxxx111xxxx1xxx111xxxxxxxxxxxxxxxxx_x-xxx1xxx1xxxxxxxx1xxxxxxxxx1x1xxxxxxxx1xxx1xxxxx", privateKey: "1xxx1x1xxxxx1xxx1x-xx_xxxx1xxxxx1x1xxx1x1x1" }, - dbOptions, + knex: { + client: 'mysql2', + connection: private.connection[process.env.NODE_ENV || "development"] + }, ipstack: "2e1805258268b4992ebac06e20fc1865", // optional, set default currency based on IP jwt: '2ad260b2202ad557b205ba17c7d8d62c69ffc95021b6147597c32eb30e3cf899', port: 3119, @@ -58,7 +63,7 @@ module.exports = { { c1: btcasset, c2: cadasset, - currency: "CAD". + currency: "CAD", amount: 0.001, askMultiplier: 1.01, bidMultiplier: 0.99, diff --git a/config/samples/private.json b/config/samples/private.json new file mode 100644 index 00000000..e56a5906 --- /dev/null +++ b/config/samples/private.json @@ -0,0 +1,33 @@ +{ + "connection": { + "development": { + "user": "tester", + "password": "testpassword", + "database": "coinos", + "host": "localhost" + }, + "test": { + "username": "proxy", + "password": "pwd", + "database": "database_test", + "host": "127.0.0.1" + }, + "production": { + "username": "proxy", + "password": "pwd", + "database": "database_production", + "host": "127.0.0.1" + } + }, + "jwt": "********", + + "BITCOIN_KEY": "*****", + "LIQUID_KEY": "*****", + "VAPID_KEY": "*****" + + "facebook": { + "appToken": "****", + "specialFriend": "****", + }, +} + -- cgit v1.2.3