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

reverseproxy: adminOrigin is not used in the ejs

Browse Source
This commit is contained in:
Girish Ramakrishnan
2021-05-05 13:13:01 -07:00
parent 16dc008702
commit 9418e93428
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/reverseproxy.js
View File

@@ -402,10 +402,9 @@ function writeDashboardNginxConfig(bundle, configFileName, vhost, callback) {
const data = {
sourceDir: path.resolve(__dirname, '..'),
adminOrigin: settings.dashboardOrigin(),
vhost: vhost,
hasIPv6: sysinfo.hasIPv6(),
endpoint: 'admin',
endpoint: 'dashboard',
certFilePath: bundle.certFilePath,
keyFilePath: bundle.keyFilePath,
robotsTxtQuoted: JSON.stringify('User-agent: *\nDisallow: /\n'),
@@ -429,12 +428,12 @@ function writeDashboardConfig(domain, callback) {
domains.get(domain, function (error, domainObject) {
if (error) return callback(error);
const adminFqdn = domains.fqdn(constants.DASHBOARD_LOCATION, domainObject);
const dashboardFqdn = domains.fqdn(constants.DASHBOARD_LOCATION, domainObject);
getCertificatePath(adminFqdn, domainObject.domain, function (error, bundle) {
getCertificatePath(dashboardFqdn, domainObject.domain, function (error, bundle) {
if (error) return callback(error);
writeDashboardNginxConfig(bundle, `${adminFqdn}.conf`, adminFqdn, callback);
writeDashboardNginxConfig(bundle, `${dashboardFqdn}.conf`, dashboardFqdn, callback);
});
});
}
@@ -459,7 +458,6 @@ function writeAppNginxConfig(app, fqdn, bundle, callback) {
const data = {
sourceDir: sourceDir,
adminOrigin: settings.dashboardOrigin(),
vhost: fqdn,
hasIPv6: sysinfo.hasIPv6(),
ip: app.containerIp,
@@ -716,7 +714,6 @@ function writeDefaultConfig(options, callback) {
const data = {
sourceDir: path.resolve(__dirname, '..'),
adminOrigin: settings.dashboardOrigin(),
vhost: '',
hasIPv6: sysinfo.hasIPv6(),
endpoint: options.activated ? 'ip' : 'setup',