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

dns api now takes full fqdn instead of subdomain

Browse Source
This commit is contained in:
Johannes Zellner
2017-11-11 22:48:09 +01:00
parent 4edd874695
commit 009b8abf1b
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/domains.js
+12 -9
View File
@@ -19,6 +19,7 @@ module.exports = exports = {
var assert = require('assert'),
certificates = require('./certificates.js'),
DatabaseError = require('./databaseerror.js'),
debug = require('debug')('box:domains.js'),
domaindb = require('./domaindb.js'),
sysinfo = require('./sysinfo.js'),
tld = require('tldjs'),
@@ -231,26 +232,28 @@ function upsertDNSRecords(fqdn, type, values, callback) {
assert(util.isArray(values));
assert.strictEqual(typeof callback, 'function');
const domain = tld.getDomain(fqdn);
const subdomain = tld.getSubdomain(fqdn);
debug('upsertDNSRecord: %s type %s values', fqdn, type, values);
get(domain, function (error, result) {
if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
if (error) return callback(new DomainError(DomainError.INTERNAL_ERROR, error));
api(result.config.provider).upsert(result.config, result.zoneName, subdomain, type, values, function (error, changeId) {
if (error) return callback(error);
api(result.config.provider).upsert(result.config, result.zoneName, subdomain, type, values, function (error, changeId) {
if (error) return callback(error);
callback(null, changeId);
});
callback(null, changeId);
});
});
}
}
function removeDNSRecords(fqdn, type, values, callback) {
function removeDNSRecords(fqdn, type, values, callback) {
assert.strictEqual(typeof fqdn, 'string');
assert.strictEqual(typeof type, 'string');
assert(util.isArray(values));
assert.strictEqual(typeof callback, 'function');
debug('removeDNSRecord: %s type %s values', fqdn, type, values);
const domain = tld.getDomain(fqdn);
const subdomain = tld.getSubdomain(fqdn);
src/platform.js
+1 -1
View File
@@ -328,7 +328,7 @@ function startMail(callback) {
];
async.mapSeries(records, function (record, iteratorCallback) {
domains.upsertDNSRecords(record.subdomain, record.type, record.values, iteratorCallback);
domains.upsertDNSRecords(config.appFqdn({ location: record.subdomain, domain: config.fqdn() }), record.type, record.values, iteratorCallback);
}, NOOP_CALLBACK); // do not crash if DNS creds do not work in startup sequence
callback();