From ff3a4f65dd903cfe4cf8a3401e0a79e819f5a700 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Thu, 1 Nov 2018 22:28:32 -0700 Subject: [PATCH] autoprovision: register cloudron when provided appstore config --- src/setup.js | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/setup.js b/src/setup.js index 73fea9b06..60f1a44b2 100644 --- a/src/setup.js +++ b/src/setup.js @@ -85,16 +85,24 @@ function autoprovision(autoconf, callback) { async.eachSeries(Object.keys(autoconf), function (key, iteratorDone) { var name; switch (key) { - case 'appstoreConfig': name = settings.APPSTORE_CONFIG_KEY; break; - case 'caasConfig': name = settings.CAAS_CONFIG_KEY; break; - case 'backupConfig': name = settings.BACKUP_CONFIG_KEY; break; + case 'appstoreConfig': + if (config.provider() === 'caas') { // skip registration + settingsdb.set(settings.APPSTORE_CONFIG_KEY, JSON.stringify(autoconf[key]), iteratorDone); + } else { // register cloudron + settings.setAppstoreConfig(autoconf[key], iteratorDone); + } + break; + case 'caasConfig': + settingsdb.set(settings.CAAS_CONFIG_KEY, JSON.stringify(autoconf[key]), iteratorDone); + break; + case 'backupConfig': + debug(`autoprovision: ${name}`); + settings.setBackupConfig(autoconf[key], iteratorDone); + break; default: debug(`autoprovision: ${key} ignored`); return iteratorDone(); } - - debug(`autoprovision: ${name}`); - settingsdb.set(name, JSON.stringify(autoconf[key]), iteratorDone); }, function (error) { if (error) return callback(new SetupError(SetupError.INTERNAL_ERROR, error));