jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

On repair oldConfig might not come as an argument

Browse Source
This commit is contained in:
Johannes Zellner
2019-09-23 15:39:28 +02:00
parent ec1f0f9320
commit 02f0055594
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/apptask.js
View File

@@ -769,7 +769,6 @@ function configure(app, args, progressCallback, callback) {
assert.strictEqual(typeof callback, 'function');
const oldConfig = args.oldConfig || {}; // this can be null in repair cases
const locationChanged = oldConfig.fqdn !== app.fqdn;
async.series([
progressCallback.bind(null, { percent: 10, message: 'Cleaning up old install' }),
@@ -779,11 +778,13 @@ function configure(app, args, progressCallback, callback) {
docker.stopContainers.bind(null, app.id),
deleteContainers.bind(null, app, { managedOnly: true }),
function (next) {
if (!oldConfig) return next();
let obsoleteDomains = oldConfig.alternateDomains.filter(function (o) {
return !app.alternateDomains.some(function (n) { return n.subdomain === o.subdomain && n.domain === o.domain; });
});
if (locationChanged) obsoleteDomains.push({ subdomain: oldConfig.location, domain: oldConfig.domain });
if (oldConfig.fqdn !== app.fqdn) obsoleteDomains.push({ subdomain: oldConfig.location, domain: oldConfig.domain });
if (obsoleteDomains.length === 0) return next();