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

Fix reverseProxy.getCertificate API

Browse Source
This commit is contained in:
Girish Ramakrishnan
2018-12-19 14:20:48 -08:00
parent 4a34703cd3
commit b5b20452cc
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/reverseproxy.js
View File

@@ -316,17 +316,18 @@ function getCertificateByHostname(hostname, domainObject, callback) {
callback(null);
}
function getCertificate(app, callback) {
assert.strictEqual(typeof app, 'object');
function getCertificate(fqdn, domain, callback) {
assert.strictEqual(typeof fqdn, 'string');
assert.strictEqual(typeof domain, 'string');
assert.strictEqual(typeof callback, 'function');
domains.get(app.domain, function (error, domainObject) {
domains.get(domain, function (error, domainObject) {
if (error) return callback(error);
getCertificateByHostname(app.fqdn, domainObject, function (error, result) {
getCertificateByHostname(fqdn, domainObject, function (error, result) {
if (error || result) return callback(error, result);
return getFallbackCertificate(app.domain, callback);
return getFallbackCertificate(domain, callback);
});
});
}
@@ -430,7 +431,7 @@ function writeAdminConfig(domain, callback) {
const adminFqdn = domains.fqdn(constants.ADMIN_LOCATION, domainObject);
getCertificate({ fqdn: adminFqdn, domain: domainObject.domain }, function (error, bundle) {
getCertificate(adminFqdn, domainObject.domain, function (error, bundle) {
if (error) return callback(error);
writeAdminNginxConfig(bundle, `${adminFqdn}.conf`, adminFqdn, callback);