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

proper task name for dashboard change

Browse Source
This commit is contained in:
Girish Ramakrishnan
2023-08-14 09:40:31 +05:30
parent abff970169
commit 4acbb7136a
13 changed files with 77 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/reverseproxy.js
View File

@@ -246,10 +246,10 @@ async function restoreFallbackCertificates() {
function getAppLocationsSync(app) {
assert.strictEqual(typeof app, 'object');
return [{ domain: app.domain, fqdn: app.fqdn, certificate: app.certificate, type: apps.LOCATION_TYPE_PRIMARY }]
.concat(app.secondaryDomains.map(sd => { return { domain: sd.domain, certificate: sd.certificate, fqdn: sd.fqdn, type: apps.LOCATION_TYPE_SECONDARY }; }))
.concat(app.redirectDomains.map(rd => { return { domain: rd.domain, certificate: rd.certificate, fqdn: rd.fqdn, type: apps.LOCATION_TYPE_REDIRECT }; }))
.concat(app.aliasDomains.map(ad => { return { domain: ad.domain, certificate: ad.certificate, fqdn: ad.fqdn, type: apps.LOCATION_TYPE_ALIAS }; }));
return [{ domain: app.domain, subdomain: app.subdomain, fqdn: app.fqdn, certificate: app.certificate, type: apps.LOCATION_TYPE_PRIMARY }]
.concat(app.secondaryDomains.map(sd => { return { domain: sd.domain, subdomain: sd.subdomain, certificate: sd.certificate, fqdn: sd.fqdn, type: apps.LOCATION_TYPE_SECONDARY }; }))
.concat(app.redirectDomains.map(rd => { return { domain: rd.domain, subdomain: rd.subdomain, certificate: rd.certificate, fqdn: rd.fqdn, type: apps.LOCATION_TYPE_REDIRECT }; }))
.concat(app.aliasDomains.map(ad => { return { domain: ad.domain, subdomain: ad.subdomain, certificate: ad.certificate, fqdn: ad.fqdn, type: apps.LOCATION_TYPE_ALIAS }; }));
}
function getAcmeCertificateNameSync(fqdn, domainObject) {
@@ -415,7 +415,7 @@ async function ensureCertificate(location, options, auditSource) {
const domainObject = await domains.get(location.domain);
if (!domainObject) throw new BoxError(BoxError.NOT_FOUND, `${location.domain} not found`);
const fqdn = location.fqdn;
const fqdn = dns.fqdn(location.subdomain, location.domain);
if (location.certificate) { // user certificate
debug(`ensureCertificate: ${fqdn} will use user certs`);