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

reverseProxy: refactor

Browse Source
This commit is contained in:
Girish Ramakrishnan
2022-01-16 10:28:49 -08:00
parent aeeeaae62a
commit 89c3847fb0
1 changed files with 9 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/reverseproxy.js
View File

@@ -549,16 +549,9 @@ async function writeAppRedirectNginxConfig(app, fqdn, bundle) {
async function writeAppConfig(app) {
assert.strictEqual(typeof app, 'object');
let appDomains = [];
appDomains.push({ domain: app.domain, fqdn: app.fqdn, type: apps.SUBDOMAIN_TYPE_PRIMARY });
app.redirectDomains.forEach(function (redirectDomain) {
appDomains.push({ domain: redirectDomain.domain, fqdn: redirectDomain.fqdn, type: apps.SUBDOMAIN_TYPE_REDIRECT });
});
app.aliasDomains.forEach(function (aliasDomain) {
appDomains.push({ domain: aliasDomain.domain, fqdn: aliasDomain.fqdn, type: apps.SUBDOMAIN_TYPE_ALIAS });
});
const appDomains = [{ domain: app.domain, fqdn: app.fqdn, type: apps.SUBDOMAIN_TYPE_PRIMARY }]
.concat(app.redirectDomains.map(rd => { return { domain: rd.domain, fqdn: rd.fqdn, type: apps.SUBDOMAIN_TYPE_REDIRECT }; }))
.concat(app.aliasDomains.map(ad => { return { domain: ad.domain, fqdn: ad.fqdn, type: apps.SUBDOMAIN_TYPE_REDIRECT }; }));
for (const appDomain of appDomains) {
const bundle = await getCertificatePath(appDomain.fqdn, appDomain.domain);
@@ -577,28 +570,15 @@ async function configureApp(app, auditSource) {
assert.strictEqual(typeof app, 'object');
assert.strictEqual(typeof auditSource, 'object');
let appDomains = [];
appDomains.push({ domain: app.domain, fqdn: app.fqdn, type: apps.SUBDOMAIN_TYPE_PRIMARY });
app.redirectDomains.forEach(function (redirectDomain) {
appDomains.push({ domain: redirectDomain.domain, fqdn: redirectDomain.fqdn, type: apps.SUBDOMAIN_TYPE_REDIRECT });
});
app.aliasDomains.forEach(function (aliasDomain) {
appDomains.push({ domain: aliasDomain.domain, fqdn: aliasDomain.fqdn, type: apps.SUBDOMAIN_TYPE_ALIAS });
});
const appDomains = [{ domain: app.domain, fqdn: app.fqdn }]
.concat(app.redirectDomains.map(rd => { return { domain: rd.domain, fqdn: rd.fqdn }; }))
.concat(app.aliasDomains.map(ad => { return { domain: ad.domain, fqdn: ad.fqdn }; }));
for (const appDomain of appDomains) {
const { bundle } = await ensureCertificate(appDomain.fqdn, appDomain.domain, auditSource);
if (appDomain.type === apps.SUBDOMAIN_TYPE_PRIMARY) {
await writeAppNginxConfig(app, appDomain.fqdn, bundle);
} else if (appDomain.type === apps.SUBDOMAIN_TYPE_REDIRECT) {
await writeAppRedirectNginxConfig(app, appDomain.fqdn, bundle);
} else if (appDomain.type === apps.SUBDOMAIN_TYPE_ALIAS) {
await writeAppNginxConfig(app, appDomain.fqdn, bundle);
}
await ensureCertificate(appDomain.fqdn, appDomain.domain, auditSource);
}
writeAppConfig(app);
}
async function unconfigureApp(app) {