From 001749564d6e1d877a565daebb9a3e33c15861de Mon Sep 17 00:00:00 2001 From: Johannes Zellner Date: Mon, 13 Jan 2020 15:35:44 +0100 Subject: [PATCH] Read the provider from the settings, not the migration PROVIDER_FILE --- src/paths.js | 1 - src/settings.js | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/paths.js b/src/paths.js index db6056122..dcab2e592 100644 --- a/src/paths.js +++ b/src/paths.js @@ -18,7 +18,6 @@ exports = module.exports = { INFRA_VERSION_FILE: path.join(baseDir(), 'platformdata/INFRA_VERSION'), LICENSE_FILE: '/etc/cloudron/LICENSE', - PROVIDER_FILE: '/etc/cloudron/PROVIDER', PLATFORM_DATA_DIR: path.join(baseDir(), 'platformdata'), APPS_DATA_DIR: path.join(baseDir(), 'appsdata'), diff --git a/src/settings.js b/src/settings.js index 78a16916c..6e5781fa4 100644 --- a/src/settings.js +++ b/src/settings.js @@ -614,15 +614,13 @@ function initCache(callback) { getAll(function (error, allSettings) { if (error) return callback(error); - const provider = safe.fs.readFileSync(paths.PROVIDER_FILE, 'utf8'); - gCache = { apiServerOrigin: allSettings[exports.API_SERVER_ORIGIN_KEY], webServerOrigin: allSettings[exports.WEB_SERVER_ORIGIN_KEY], adminDomain: allSettings[exports.ADMIN_DOMAIN_KEY], adminFqdn: allSettings[exports.ADMIN_FQDN_KEY], isDemo: allSettings[exports.DEMO_KEY], - provider: provider ? provider.trim() : 'generic' + provider: allSettings[exports.SYSINFO_CONFIG_KEY].provider }; callback();