diff --git a/config/about.js b/config/about.js deleted file mode 100644 index f1efa1f..0000000 --- a/config/about.js +++ /dev/null @@ -1,15 +0,0 @@ -/* - This file should be customized for your app. The string in this file is - displayed when a user makes the 'about' JSON RPC call. -*/ - -module.exports = ` -This is the about string for the ipfs-service-provider repository: -https://github.com/Permissionless-Software-Foundation/ipfs-service-provider - -Brought to you by the Permissionless Software Foundation: -https://PSFoundation.cash - -Documentation: -https://ipfs-service-provider.fullstack.cash/ -` diff --git a/config/env/common.js b/config/env/common.js index b7f1384..b9e43c1 100644 --- a/config/env/common.js +++ b/config/env/common.js @@ -5,6 +5,14 @@ /* eslint no-unneeded-ternary:0 */ +// Get the version from the package.json file. +const pkgInfo = require('../../package.json') +const version = pkgInfo.version + +const ipfsCoordName = process.env.COORD_NAME + ? process.env.COORD_NAME + : 'ipfs-bch-wallet-service' + module.exports = { // Configure TCP port. port: process.env.PORT || 5001, @@ -13,9 +21,15 @@ module.exports = { logPass: 'test', // Email server settings if nodemailer email notifications are used. - emailServer: process.env.EMAILSERVER ? process.env.EMAILSERVER : 'mail.someserver.com', - emailUser: process.env.EMAILUSER ? process.env.EMAILUSER : 'noreply@someserver.com', - emailPassword: process.env.EMAILPASS ? process.env.EMAILPASS : 'emailpassword', + emailServer: process.env.EMAILSERVER + ? process.env.EMAILSERVER + : 'mail.someserver.com', + emailUser: process.env.EMAILUSER + ? process.env.EMAILUSER + : 'noreply@someserver.com', + emailPassword: process.env.EMAILPASS + ? process.env.EMAILPASS + : 'emailpassword', // IPFS settings. isCircuitRelay: process.env.ENABLE_CIRCUIT_RELAY ? true : false, @@ -27,8 +41,10 @@ module.exports = { announceJsonLd: { '@context': 'https://schema.org/', '@type': 'WebAPI', - name: 'ipfs-service-provider', - description: 'This is a generic IPFS Serivice Provider that uses JSON RPC over IPFS to communicate with it. This instance has not been customized. Source code: https://github.com/Permissionless-Software-Foundation/ipfs-service-provider', + name: ipfsCoordName, + version, + description: + 'This is a generic IPFS Serivice Provider that uses JSON RPC over IPFS to communicate with it. This instance has not been customized. Source code: https://github.com/Permissionless-Software-Foundation/ipfs-service-provider', documentation: 'https://ipfs-service-provider.fullstack.cash/', provider: { '@type': 'Organization', diff --git a/package.json b/package.json index dad4b95..57ed9a4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ipfs-service-provider", - "version": "1.0.0", + "version": "1.3.0", "description": "A Koa-based combination of a REST API and IPFS JSON RPC. Boilerplate for starting new projects.", "main": "index.js", "scripts": { diff --git a/src/controllers/json-rpc/about/index.js b/src/controllers/json-rpc/about/index.js index 6f3948a..77a7e61 100644 --- a/src/controllers/json-rpc/about/index.js +++ b/src/controllers/json-rpc/about/index.js @@ -6,7 +6,7 @@ const jsonrpc = require('jsonrpc-lite') // Local libraries -const aboutStr = require('../../../../config/about') +const config = require('../../../../config') class AboutRPC { constructor (localConfig) { @@ -36,7 +36,8 @@ class AboutRPC { return { success: true, status: 200, - message: aboutStr, + // message: aboutStr, + message: JSON.stringify(config.announceJsonLd), endpoint: 'about' } }