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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
ansuz
2019-04-01 16:35:58 +02:00
parent 4566bf4ed8 d0c7d4cfb8
commit dd6767e267
29 changed files with 144 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server.js
View File

@@ -18,6 +18,11 @@ try {
console.log("You can customize the configuration by copying config/config.example.js to config/config.js");
config = require('./config/config.example');
}
if (config.adminEmail === 'i.did.not.read.my.config@cryptpad.fr') {
console.log("You can configure the administrator email (adminEmail) in your config/config.js file");
}
var websocketPort = config.websocketPort || config.httpPort;
var useSecureWebsockets = config.useSecureWebsockets || false;