Added abstraction layer around config.

`roles` in config renamed to `defaultRoles`. These are used if no `roles` are provided in production.yaml

client/src/Home.js

@@ -19,8 +19,8 @@ export default class List extends Component {
 
         return (
             <div>
-                <h2>{t('welcomeToMailtrain')}</h2>
+                <h2>{t('Mailtrain 2 beta')}</h2>
-                <div>TODO: some dashboard</div>
+                <div>{t('Build') + ' 2019-07-26-1703'}</div>
             </div>
         );
     }

server/app-builder.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('./lib/config');
 const log = require('./lib/log');
 
 const express = require('express');

server/config/default.yaml

@@ -257,7 +257,7 @@ seleniumWebDriver:
   browser: phantomjs
 
 
-roles:
+defaultRoles:
   global:
     master:
       name: Global Master

server/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('./lib/config');
 const log = require('./lib/log');
 const appBuilder = require('./app-builder');
 const translate = require('./lib/translate');

server/lib/builtin-zone-mta.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('./config');
 const fork = require('./fork').fork;
 const log = require('./log');
 const path = require('path');

server/lib/client-helpers.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const passport = require('./passport');
-const config = require('config');
+const config = require('./config');
 const forms = require('../models/forms');
 const shares = require('../models/shares');
 const urls = require('./urls');

server/lib/config.js

@@ -0,0 +1,9 @@
+"use strict";
+
+const config = require('config');
+
+if (!config.roles) {
+    config.roles = config.defaultRoles;
+}
+
+module.exports = config;

server/lib/dbcheck.js

@@ -4,7 +4,7 @@
 This module handles Mailtrain database initialization and upgrades
 */
 
-const config = require('config');
+const config = require('./config');
 const mysql = require('mysql');
 const log = require('./log');
 const fs = require('fs');

server/lib/knex.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('./config');
 const path = require('path');
 
 const knexConstructor = require('knex');

server/lib/log.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('./config');
 const log = require('npmlog');
 
 log.level = config.log.level;

server/lib/mailers.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const log = require('./log');
-const config = require('config');
+const config = require('./config');
 
 const nodemailer = require('nodemailer');
 const aws = require('aws-sdk');

server/lib/message-sender.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('./config');
 const log = require('./log');
 const mailers = require('./mailers');
 const knex = require('./knex');

server/lib/passport.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('./config');
 const log = require('./log');
 const util = require('util');
 

server/lib/privilege-helpers.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const log = require('./log');
-const config = require('config');
+const config = require('./config');
 
 const fs = require('fs-extra-promise');
 

server/lib/translate.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('./config');
 const i18n = require("i18next");
 const fs = require('fs');
 const path = require('path');

server/lib/urls.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('./config');
 const urllib = require('url');
 const {anonymousRestrictedAccessToken} = require('../../shared/urls');
 const {getLangCodeFromExpressLocale} = require('./translate');

server/models/shares.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const knex = require('../lib/knex');
-const config = require('config');
+const config = require('../lib/config');
 const { enforce, castToInteger } = require('../lib/helpers');
 const dtHelpers = require('../lib/dt-helpers');
 const entitySettings = require('../lib/entity-settings');

server/models/subscriptions.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('../lib/config');
 const knex = require('../lib/knex');
 const hasher = require('node-object-hash')();
 const shortid = require('shortid');

server/models/users.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('../lib/config');
 const knex = require('../lib/knex');
 const hasher = require('node-object-hash')();
 const { enforce, filterObject } = require('../lib/helpers');

server/routes/api.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('../lib/config');
 const lists = require('../models/lists');
 const tools = require('../lib/tools');
 const blacklist = require('../models/blacklist');

server/routes/links.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const log = require('../lib/log');
-const config = require('config');
+const config = require('../lib/config');
 const router = require('../lib/router-async').create();
 const links = require('../models/links');
 const interoperableErrors = require('../../shared/interoperable-errors');

server/routes/sandboxed-mosaico.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('../lib/config');
 const path = require('path');
 const express = require('express');
 const routerFactory = require('../lib/router-async');

server/routes/subscription.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const log = require('../lib/log');
-const config = require('config');
+const config = require('../lib/config');
 const router = require('../lib/router-async').create();
 const confirmations = require('../models/confirmations');
 const subscriptions = require('../models/subscriptions');

server/services/executor.js

@@ -4,7 +4,7 @@
    that can chroot.
   */
 
-const config = require('config');
+const config = require('../lib/config');
 const reportHelpers = require('../lib/report-helpers');
 const fork = require('../lib/fork').fork;
 const path = require('path');

server/services/feedcheck.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('../lib/config');
 const log = require('../lib/log');
 const knex = require('../lib/knex');
 const feedparser = require('feedparser-promised');

server/services/gdpr-cleanup.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('../lib/config');
 const log = require('../lib/log');
 const knex = require('../lib/knex');
 const subscriptions = require('../models/subscriptions');

server/services/importer.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('../lib/config');
 const knex = require('../lib/knex');
 const path = require('path');
 const log = require('../lib/log');

server/services/postfix-bounce-server.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const log = require('../lib/log');
-const config = require('config');
+const config = require('../lib/config');
 const net = require('net');
 const campaigns = require('../models/campaigns');
 const contextHelpers = require('../lib/context-helpers');

server/services/sender-master.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('../lib/config');
 const fork = require('../lib/fork').fork;
 const log = require('../lib/log');
 const path = require('path');

server/services/sender-worker.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('../lib/config');
 const log = require('../lib/log');
 const mailers = require('../lib/mailers');
 const messageSender = require('../lib/message-sender');

server/services/test-server.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const log = require('../lib/log');
-const config = require('config');
+const config = require('../lib/config');
 const crypto = require('crypto');
 const humanize = require('humanize');
 const http = require('http');

server/services/verp-server.js

@@ -2,7 +2,7 @@
 
 const { nodeifyFunction, nodeifyPromise } = require('../lib/nodeify');
 const log = require('../lib/log');
-const config = require('config');
+const config = require('../lib/config');
 const {MailerError} = require('../lib/mailers');
 const campaigns = require('../models/campaigns');
 const contextHelpers = require('../lib/context-helpers');

server/test/e2e/lib/config.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const config = require('config');
+const config = require('../../../lib/config');
 
 module.exports = {
     app: config,