diff --git a/src/provision.js b/src/provision.js index 9e5884d50..9375da739 100644 --- a/src/provision.js +++ b/src/provision.js @@ -88,9 +88,9 @@ function unprovision(callback) { } -function setup(dnsConfig, backupConfig, auditSource, callback) { +function setup(dnsConfig, sysinfoConfig, auditSource, callback) { assert.strictEqual(typeof dnsConfig, 'object'); - assert.strictEqual(typeof backupConfig, 'object'); + assert.strictEqual(typeof sysinfoConfig, 'object'); assert.strictEqual(typeof auditSource, 'object'); assert.strictEqual(typeof callback, 'function'); @@ -131,10 +131,10 @@ function setup(dnsConfig, backupConfig, auditSource, callback) { async.series([ autoRegister.bind(null, domain), + (next) => { if (!sysinfoConfig) return next(); settings.setSysinfoConfig(sysinfoConfig, next); }, domains.prepareDashboardDomain.bind(null, domain, auditSource, (progress) => setProgress('setup', progress.message, NOOP_CALLBACK)), cloudron.setDashboardDomain.bind(null, domain, auditSource), mail.addDomain.bind(null, domain), // this relies on settings.mailFqdn() and settings.adminDomain() - (next) => { if (!backupConfig) return next(); settings.setBackupConfig(backupConfig, next); }, setProgress.bind(null, 'setup', 'Done'), eventlog.add.bind(null, eventlog.ACTION_PROVISION, auditSource, { }) ], function (error) { diff --git a/src/routes/provision.js b/src/routes/provision.js index 3609b4f3d..afe7b519b 100644 --- a/src/routes/provision.js +++ b/src/routes/provision.js @@ -53,12 +53,12 @@ function setup(req, res, next) { if ('tlsConfig' in dnsConfig && typeof dnsConfig.tlsConfig !== 'object') return next(new HttpError(400, 'tlsConfig must be an object')); if (dnsConfig.tlsConfig && (!dnsConfig.tlsConfig.provider || typeof dnsConfig.tlsConfig.provider !== 'string')) return next(new HttpError(400, 'tlsConfig.provider must be a string')); - if ('backupConfig' in req.body && typeof req.body.backupConfig !== 'object') return next(new HttpError(400, 'backupConfig must be an object')); + if ('sysinfoConfig' in req.body && typeof req.body.sysinfoConfig !== 'object') return next(new HttpError(400, 'sysinfoConfig must be an object')); // it can take sometime to setup DNS, register cloudron req.clearTimeout(); - provision.setup(dnsConfig, req.body.backupConfig || null, auditSource.fromRequest(req), function (error) { + provision.setup(dnsConfig, req.body.sysinfoConfig || null, auditSource.fromRequest(req), function (error) { if (error) return next(BoxError.toHttpError(error)); next(new HttpSuccess(200, {}));