diff --git a/src/cloudron.js b/src/cloudron.js index 807929f8e..0dcd41deb 100644 --- a/src/cloudron.js +++ b/src/cloudron.js @@ -19,6 +19,8 @@ exports = module.exports = { setDashboardAndMailDomain: setDashboardAndMailDomain, renewCerts: renewCerts, + setupDashboard: setupDashboard, + runSystemChecks: runSystemChecks, // exposed for testing @@ -397,6 +399,17 @@ function setDashboardAndMailDomain(domain, auditSource, callback) { }); } +function setupDashboard(auditSource, progressCallback, callback) { + assert.strictEqual(typeof auditSource, 'object'); + assert.strictEqual(typeof progressCallback, 'function'); + assert.strictEqual(typeof callback, 'function'); + + async.series([ + domains.prepareDashboardDomain.bind(null, settings.adminDomain(), auditSource, progressCallback), + setDashboardDomain.bind(null, settings.adminDomain(), auditSource) + ], callback); +} + function renewCerts(options, auditSource, callback) { assert.strictEqual(typeof options, 'object'); assert.strictEqual(typeof auditSource, 'object'); diff --git a/src/provision.js b/src/provision.js index 1c4cc63a3..75cc4f56c 100644 --- a/src/provision.js +++ b/src/provision.js @@ -277,8 +277,7 @@ function restore(backupConfig, backupId, version, auditSource, callback) { async.series([ setProgress.bind(null, 'restore', 'Downloading backup'), backups.restore.bind(null, backupConfig, backupId, (progress) => setProgress('restore', progress.message, NOOP_CALLBACK)), - domains.prepareDashboardDomain.bind(null, settings.adminDomain(), auditSource, (progress) => setProgress('restore', progress.message, NOOP_CALLBACK)), - cloudron.setDashboardDomain.bind(null, settings.adminDomain(), auditSource), + cloudron.setupDashboard.bind(null, auditSource, (progress) => setProgress('restore', progress.message, NOOP_CALLBACK)), settings.setBackupConfig.bind(null, backupConfig), // update with the latest backupConfig eventlog.add.bind(null, eventlog.ACTION_RESTORE, auditSource, { backupId }), ], function (error) {