standardize loading of server configuration

lib/load-config.js

@@ -0,0 +1,12 @@
+var config;
+try {
+    config = require("../config/config");
+    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");
+    }
+} catch (e) {
+    console.log("You can customize the configuration by copying config/config.example.js to config/config.js");
+    config = require("../config/config.example");
+}
+module.exports = config;
+

scripts/check-account-deletion.js

@@ -4,7 +4,7 @@ const nThen = require('nthen');
 const Pinned = require('./pinned');
 const Nacl = require('tweetnacl');
 const Path = require('path');
-const Config = require('./load-config');
+const Config = require('../lib/load-config');
 
 const hashesFromPinFile = (pinFile, fileName) => {
     var pins = {};

scripts/check-accounts.js

@@ -1,6 +1,6 @@
 /* globals Buffer */
 var Https = require('https');
-var Config = require("../config/config.js");
+var Config = require("../lib/load-config");
 var Package = require("../package.json");
 
 var body = JSON.stringify({

scripts/delete-inactive.js

@@ -3,12 +3,7 @@ const Fs = require("fs");
 const nThen = require("nthen");
 const Saferphore = require("saferphore");
 const PinnedData = require('./pinneddata');
-let config;
+const config = require("../lib/load-config");
-try {
-    config = require('./config/config');
-} catch (e) {
-    config = require('./config/config.example');
-}
 
 if (!config.inactiveTime || typeof(config.inactiveTime) !== "number") { return; }
 

scripts/expire-channels.js

@@ -3,7 +3,7 @@ var Path = require("path");
 
 var nThen = require("nthen");
 
-var config = require("./load-config");
+var config = require("../lib/load-config");
 
 var FileStorage = require('../' + config.storage || './storage/file');
 var root = Path.resolve('../' + config.taskPath || './tasks');

scripts/load-config.js

@@ -1,7 +0,0 @@
-var config;
-try {
-    config = require("../config/config");
-} catch (e) {
-    config = require("../config/config.example");
-}
-module.exports = config;

scripts/pinned.js

@@ -106,6 +106,6 @@ if (!module.parent) {
             console.log(x + ' ' + JSON.stringify(data[x]));
         });
     }, {
-        pinPath: require("../config/config").pinPath
+        pinPath: require("../lib/load-config").pinPath
     });
 }

server.js

@@ -11,17 +11,7 @@ var Package = require('./package.json');
 var Path = require("path");
 var nThen = require("nthen");
 
-var config;
+var config = require("./lib/load-config");
-try {
-    config = require('./config/config');
-} catch (e) {
-    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;