web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drop support for configuration points we can't possibly support

Browse Source
This commit is contained in:
ansuz 2019-12-23 17:28:01 -05:00
parent 4c51d464fd
commit 67cde69120
2 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
config/config.example.js
View File

@ -272,7 +272,6 @@ module.exports = {
*/ */
openFileLimit: 2048, openFileLimit: 2048,
/* ===================== /* =====================
* DATABASE VOLUMES * DATABASE VOLUMES
* ===================== */ * ===================== */
@ -359,34 +358,6 @@ module.exports = {
*/ */
logFeedback: false, logFeedback: false,
/* =====================
* DEPRECATED
* ===================== */
/*
You have the option of specifying an alternative storage adaptor.
These status of these alternatives are specified in their READMEs,
which are available at the following URLs:
mongodb: a noSQL database
https://github.com/xwiki-labs/cryptpad-mongo-store
amnesiadb: in memory storage
https://github.com/xwiki-labs/cryptpad-amnesia-store
leveldb: a simple, fast, key-value store
https://github.com/xwiki-labs/cryptpad-level-store
sql: an adaptor for a variety of sql databases via knexjs
https://github.com/xwiki-labs/cryptpad-sql-store
For the most up to date solution, use the default storage adaptor.
*/
storage: './storage/file',
/* CryptPad's socket server can be extended to respond to RPC calls
* you can configure it to respond to custom RPC calls if you like.
* provide the path to your RPC module here, or `false` if you would
* like to disable the RPC interface completely
*/
rpc: './rpc.js',
/* CryptPad supports verbose logging /* CryptPad supports verbose logging
* (false by default) * (false by default)
*/ */

10
server.js
View File

@ -5,7 +5,7 @@ var Express = require('express');
var Http = require('http'); var Http = require('http');
var Fs = require('fs'); var Fs = require('fs');
var WebSocketServer = require('ws').Server; var WebSocketServer = require('ws').Server;
var NetfluxSrv = require('./node_modules/chainpad-server/NetfluxWebsocketSrv'); var NetfluxSrv = require('chainpad-server/NetfluxWebsocketSrv');
var Package = require('./package.json'); var Package = require('./package.json');
var Path = require("path"); var Path = require("path");
var nThen = require("nthen"); var nThen = require("nthen");
@ -13,7 +13,7 @@ var nThen = require("nthen");
var config = require("./lib/load-config"); var config = require("./lib/load-config");
// support multiple storage back ends // support multiple storage back ends
var Storage = require(config.storage||'./storage/file'); var Storage = require('./storage/file');
var app = Express(); var app = Express();
@ -256,11 +256,7 @@ var nt = nThen(function (w) {
}, 1000 * 60 * 5); // run every five minutes }, 1000 * 60 * 5); // run every five minutes
})); }));
}).nThen(function (w) { }).nThen(function (w) {
config.rpc = typeof(config.rpc) === 'undefined'? './rpc.js' : config.rpc; require("./rpc").create(config, w(function (e, _rpc) {
if (typeof(config.rpc) !== 'string') { return; }
// load pin store...
var Rpc = require(config.rpc);
Rpc.create(config, w(function (e, _rpc) {
if (e) { if (e) {
w.abort(); w.abort();
throw e; throw e;