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

Set the domain only during dns setup

Browse Source 
If we change the domain when dns settings are changed, then migration
fails because we callout to appstore API via the domain (for example,
backup url call will fail because it uses the new domain name).
This commit is contained in:
Girish Ramakrishnan
2017-01-10 15:55:31 -08:00
parent ba02d333d1
commit 80d65acd0d
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/settings.js
View File

@@ -350,10 +350,7 @@ function setDnsConfig(dnsConfig, callback) {
sysinfo.getIp(function (error, ip) {
if (error) return callback(new SettingsError(SettingsError.INTERNAL_ERROR, 'Error getting IP:' + error.message));
// add the domain in case we do not change it with this request
if (!dnsConfig.domain) dnsConfig.domain = config.fqdn();
subdomains.verifyDnsConfig(dnsConfig, dnsConfig.domain, ip, function (error, result) {
subdomains.verifyDnsConfig(dnsConfig, config.fqdn(), ip, function (error, result) {
if (error && error.reason === SubdomainError.ACCESS_DENIED) return callback(new SettingsError(SettingsError.BAD_FIELD, 'Error adding A record. Access denied'));
if (error && error.reason === SubdomainError.NOT_FOUND) return callback(new SettingsError(SettingsError.BAD_FIELD, 'Zone not found'));
if (error && error.reason === SubdomainError.EXTERNAL_ERROR) return callback(new SettingsError(SettingsError.BAD_FIELD, 'Error adding A record:' + error.message));
@@ -364,9 +361,6 @@ function setDnsConfig(dnsConfig, callback) {
settingsdb.set(exports.DNS_CONFIG_KEY, JSON.stringify(result), function (error) {
if (error) return callback(new SettingsError(SettingsError.INTERNAL_ERROR, error));
// sync the domain to the cloudron.conf
if (dnsConfig.domain) config.set('fqdn', dnsConfig.domain);
exports.events.emit(exports.DNS_CONFIG_KEY, dnsConfig);
callback(null);