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

If oldConfig.domain is missing use config.fqdn()

Browse Source 
do this in configure() because the code asserts on domain being
a string
This commit is contained in:
Girish Ramakrishnan
2018-01-10 21:22:44 -08:00
parent 915cfbe7dd
commit d9bf2f1724
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/apptask.js
View File

@@ -301,9 +301,6 @@ function unregisterSubdomain(app, location, domain, callback) {
assert.strictEqual(typeof domain, 'string');
assert.strictEqual(typeof callback, 'function');
// FIXME remove the oldConfig.domain fallback in following releases
domain = domain || config.fqdn();
if (!app.dnsRecordId) {
debugApp(app, 'Skip unregister of record not created by cloudron');
return callback(null);
@@ -513,7 +510,9 @@ function configure(app, callback) {
deleteContainers.bind(null, app),
function (next) {
if (!locationChanged) return next();
unregisterSubdomain(app, app.oldConfig.location, app.oldConfig.domain, next);
// the config.fqdn() fallback can be removed after 1.9
unregisterSubdomain(app, app.oldConfig.location, app.oldConfig.domain || config.fqdn(), next);
},
reserveHttpPort.bind(null, app),