diff --git a/src/cloudron.js b/src/cloudron.js index f8c416136..c682160f0 100644 --- a/src/cloudron.js +++ b/src/cloudron.js @@ -16,8 +16,6 @@ exports = module.exports = { updateDashboardDomain, renewCerts, - setupDashboard, - runSystemChecks }; @@ -335,17 +333,6 @@ function updateDashboardDomain(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.setupDashboardDnsAndCert.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 de72b0813..2b3fff3ae 100644 --- a/src/provision.js +++ b/src/provision.js @@ -199,7 +199,13 @@ function restore(backupConfig, backupId, version, sysinfoConfig, auditSource, ca setProgress.bind(null, 'restore', 'Downloading backup'), backups.restore.bind(null, backupConfig, backupId, (progress) => setProgress('restore', progress.message, NOOP_CALLBACK)), settings.setSysinfoConfig.bind(null, sysinfoConfig), - cloudron.setupDashboard.bind(null, auditSource, (progress) => setProgress('restore', progress.message, NOOP_CALLBACK)), + (done) => { + const adminDomain = settings.adminDomain(); // load this fresh from after the backup.restore + async.series([ + domains.setupDashboardDnsAndCert.bind(null, adminDomain, auditSource, (progress) => setProgress('restore', progress.message, NOOP_CALLBACK)), + cloudron.setDashboardDomain.bind(null, adminDomain, auditSource) + ], done); + }, settings.setBackupCredentials.bind(null, backupConfig), // update just the credentials and not the policy and flags eventlog.add.bind(null, eventlog.ACTION_RESTORE, auditSource, { backupId }), ], function (error) {