diff --git a/src/cloudron.js b/src/cloudron.js index 51ef777f1..9ac0d025b 100644 --- a/src/cloudron.js +++ b/src/cloudron.js @@ -287,9 +287,6 @@ function getConfig(callback) { // TODO provide that number from the appstore var memory = bytes(result.size) || 0; - // FIXME we should have a separate flag to indicate caas - var provider = result.region === null ? null : 'caas'; - settings.getCloudronName(function (error, cloudronName) { if (error) return callback(new CloudronError(CloudronError.INTERNAL_ERROR, error)); @@ -310,7 +307,7 @@ function getConfig(callback) { region: result.region, size: result.size, memory: memory, - provider: provider, + provider: config.provider(), cloudronName: cloudronName }); }); diff --git a/src/config.js b/src/config.js index ce4b5f1ab..8a6c04c4d 100644 --- a/src/config.js +++ b/src/config.js @@ -17,6 +17,7 @@ exports = module.exports = { TEST: process.env.BOX_ENV === 'test', // convenience getters + provider: provider, apiServerOrigin: apiServerOrigin, webServerOrigin: webServerOrigin, fqdn: fqdn, @@ -82,6 +83,7 @@ function initConfig() { data.ldapPort = 3002; data.oauthProxyPort = 3003; data.simpleAuthPort = 3004; + data.provider = 'caas'; if (exports.CLOUDRON) { data.port = 3000; @@ -194,3 +196,7 @@ function database() { function isDev() { return /dev/i.test(get('boxVersionsUrl')); } + +function provider() { + return get('provider'); +}