move use of TEST and CLOUDRON to constants

src/apptask.js

@@ -28,6 +28,7 @@ var addons = require('./addons.js'),
     auditsource = require('./auditsource.js'),
     backups = require('./backups.js'),
     config = require('./config.js'),
+    constants = require('./constants.js'),
     database = require('./database.js'),
     DatabaseError = require('./databaseerror.js'),
     debug = require('debug')('box:apptask'),
@@ -447,7 +448,7 @@ function waitForDnsPropagation(app, callback) {
     assert.strictEqual(typeof app, 'object');
     assert.strictEqual(typeof callback, 'function');
 
-    if (!config.CLOUDRON) {
+    if (!constants.CLOUDRON) {
         debugApp(app, 'Skipping dns propagation check for development');
         return callback(null);
     }

src/config.js

@@ -1,16 +1,10 @@
 'use strict';
 
 exports = module.exports = {
-    baseDir: baseDir,
-
     // values set here will be lost after a upgrade/update. use the sqlite database
     // for persistent values that need to be backed up
     set: set,
 
-    // ifdefs to check environment
-    CLOUDRON: process.env.BOX_ENV === 'cloudron',
-    TEST: process.env.BOX_ENV === 'test',
-
     // convenience getters
     apiServerOrigin: apiServerOrigin,
     webServerOrigin: webServerOrigin,
@@ -31,25 +25,19 @@ exports = module.exports = {
 };
 
 var assert = require('assert'),
+    constants = require('./constants.js'),
     fs = require('fs'),
     path = require('path'),
+    paths = require('./paths.js'),
     safe = require('safetydance'),
     _ = require('underscore');
 
-
 // assert on unknown environment can't proceed
-assert(exports.CLOUDRON || exports.TEST, 'Unknown environment. This should not happen!');
+assert(constants.CLOUDRON || constants.TEST, 'Unknown environment. This should not happen!');
 
 var data = { };
 
-function baseDir() {
-    const homeDir = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
-    if (exports.CLOUDRON) return homeDir;
-    if (exports.TEST) return path.join(homeDir, '.cloudron_test');
-    // cannot reach
-}
-
-const cloudronConfigFileName = exports.CLOUDRON ? '/etc/cloudron/cloudron.conf' : path.join(baseDir(), 'cloudron.conf');
+const cloudronConfigFileName = constants.CLOUDRON ? '/etc/cloudron/cloudron.conf' : path.join(paths.baseDir(), 'cloudron.conf');
 
 function saveSync() {
     // only save values we want to have in the cloudron.conf, see start.sh
@@ -80,7 +68,7 @@ function initConfig() {
     data.webServerOrigin = null;
 
     // overrides for local testings
-    if (exports.TEST) {
+    if (constants.TEST) {
         data.apiServerOrigin = 'http://localhost:6060'; // hock doesn't support https
     }
 

src/cron.js

@@ -15,7 +15,6 @@ var appHealthMonitor = require('./apphealthmonitor.js'),
     auditSource = require('./auditsource.js'),
     backups = require('./backups.js'),
     cloudron = require('./cloudron.js'),
-    config = require('./config.js'),
     constants = require('./constants.js'),
     CronJob = require('cron').CronJob,
     debug = require('debug')('box:cron'),
@@ -165,7 +164,7 @@ function recreateJobs(tz) {
 
     if (gJobs.schedulerSync) gJobs.schedulerSync.stop();
     gJobs.schedulerSync = new CronJob({
-        cronTime: config.TEST ? '*/10 * * * * *' : '00 */1 * * * *', // every minute
+        cronTime: constants.TEST ? '*/10 * * * * *' : '00 */1 * * * *', // every minute
         onTick: scheduler.sync,
         start: true,
         timeZone: tz

src/dockerproxy.js

@@ -8,7 +8,6 @@ exports = module.exports = {
 var apps = require('./apps.js'),
     AppsError = apps.AppsError,
     assert = require('assert'),
-    config = require('./config.js'),
     constants = require('./constants.js'),
     express = require('express'),
     debug = require('debug')('box:dockerproxy'),
@@ -30,7 +29,7 @@ function authorizeApp(req, res, next) {
     // - only allow managing and inspection of containers belonging to the app
 
     // make the tests pass for now
-    if (config.TEST) {
+    if (constants.TEST) {
         req.app = { id: 'testappid' };
         return next();
     }
@@ -121,7 +120,7 @@ function start(callback) {
 
     let proxyServer = express();
 
-    if (config.TEST) {
+    if (constants.TEST) {
         proxyServer.use(function (req, res, next) {
             debug('proxying: ' + req.method, req.url);
             next();

src/native-dns.js

@@ -5,7 +5,7 @@ exports = module.exports = {
 };
 
 var assert = require('assert'),
-    config = require('./config.js'),
+    constants = require('./constants.js'),
     dns = require('dns'),
     _ = require('underscore');
 
@@ -24,7 +24,7 @@ function resolve(hostname, rrtype, options, callback) {
     options = _.extend({ }, DEFAULT_OPTIONS, options);
 
     // Only use unbound on a Cloudron
-    if (config.CLOUDRON) resolver.setServers([ options.server ]);
+    if (constants.CLOUDRON) resolver.setServers([ options.server ]);
 
     // should callback with ECANCELLED but looks like we might hit https://github.com/nodejs/node/issues/14814
     const timerId = setTimeout(resolver.cancel.bind(resolver), options.timeout || 5000);

src/scheduler.js

@@ -8,7 +8,7 @@ var appdb = require('./appdb.js'),
     apps = require('./apps.js'),
     assert = require('assert'),
     async = require('async'),
-    config = require('./config.js'),
+    constants = require('./constants.js'),
     CronJob = require('cron').CronJob,
     debug = require('debug')('box:scheduler'),
     docker = require('./docker.js'),
@@ -119,7 +119,7 @@ function createCronJobs(app, schedulerConfig) {
 
         const randomSecond = Math.floor(60*Math.random()); // don't start all crons to decrease memory pressure
 
-        var cronTime = (config.TEST ? '*/5 ' : `${randomSecond} `) + task.schedule; // time ticks faster in tests
+        var cronTime = (constants.TEST ? '*/5 ' : `${randomSecond} `) + task.schedule; // time ticks faster in tests
 
         debug(`createCronJobs: ${app.fqdn} task ${taskName} scheduled at ${cronTime} with cmd ${task.command}`);
 

src/support.js

@@ -8,7 +8,7 @@ exports = module.exports = {
 };
 
 let assert = require('assert'),
-    config = require('./config.js'),
+    constants = require('./constants.js'),
     shell = require('./shell.js'),
     once = require('once'),
     path = require('path'),
@@ -17,8 +17,8 @@ let assert = require('assert'),
     util = require('util');
 
 // the logic here is also used in the cloudron-support tool
-var AUTHORIZED_KEYS_FILEPATH = config.TEST ? path.join(paths.baseDir(), 'authorized_keys') : ((sysinfo.provider() === 'ec2' || sysinfo.provider() === 'lightsail' || sysinfo.provider() === 'ami') ? '/home/ubuntu/.ssh/authorized_keys' : '/root/.ssh/authorized_keys'),
-    AUTHORIZED_KEYS_USER = config.TEST ? process.getuid() : ((sysinfo.provider() === 'ec2' || sysinfo.provider() === 'lightsail' || sysinfo.provider() === 'ami') ? 'ubuntu' : 'root'),
+var AUTHORIZED_KEYS_FILEPATH = constants.TEST ? path.join(paths.baseDir(), 'authorized_keys') : ((sysinfo.provider() === 'ec2' || sysinfo.provider() === 'lightsail' || sysinfo.provider() === 'ami') ? '/home/ubuntu/.ssh/authorized_keys' : '/root/.ssh/authorized_keys'),
+    AUTHORIZED_KEYS_USER = constants.TEST ? process.getuid() : ((sysinfo.provider() === 'ec2' || sysinfo.provider() === 'lightsail' || sysinfo.provider() === 'ami') ? 'ubuntu' : 'root'),
     AUTHORIZED_KEYS_CMD = path.join(__dirname, 'scripts/remotesupport.sh');
 
 function SupportError(reason, errorOrMessage) {