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

move dashboard setting into dashboard.js

Browse Source
This commit is contained in:
Girish Ramakrishnan
2023-08-11 19:41:05 +05:30
parent 27ce8f9351
commit eee49a8291
25 changed files with 157 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dns.js
+4 -3
View File
@@ -26,6 +26,7 @@ const apps = require('./apps.js'),
assert = require('assert'),
BoxError = require('./boxerror.js'),
constants = require('./constants.js'),
dashboard = require('./dashboard.js'),
debug = require('debug')('box:dns'),
domains = require('./domains.js'),
ipaddr = require('ipaddr.js'),
@@ -34,7 +35,6 @@ const apps = require('./apps.js'),
network = require('./network.js'),
promiseRetry = require('./promise-retry.js'),
safe = require('safetydance'),
settings = require('./settings.js'),
tasks = require('./tasks.js'),
tld = require('tldjs');
@@ -281,6 +281,7 @@ async function syncDnsRecords(options, progressCallback) {
if (options.domain) allDomains = allDomains.filter(d => d.domain === options.domain);
const { domain:mailDomain, fqdn:mailFqdn, subdomain:mailSubdomain } = await mailServer.getLocation();
const { domain:dashboardDomain, fqdn:dashboardFqdn } = await dashboard.getLocation();
const allApps = await apps.list();
@@ -292,8 +293,8 @@ async function syncDnsRecords(options, progressCallback) {
progress += Math.round(100/(1+allDomains.length));
let locations = [];
if (domain.domain === settings.dashboardDomain()) locations.push({ subdomain: constants.DASHBOARD_SUBDOMAIN, domain: settings.dashboardDomain() });
if (domain.domain === mailDomain && mailFqdn !== settings.dashboardFqdn()) locations.push({ subdomain: mailSubdomain, domain: mailDomain });
if (domain.domain === dashboardDomain) locations.push({ subdomain: constants.DASHBOARD_SUBDOMAIN, domain: dashboardDomain });
if (domain.domain === mailDomain && mailFqdn !== dashboardFqdn) locations.push({ subdomain: mailSubdomain, domain: mailDomain });
for (const app of allApps) {
const appLocations = [{ subdomain: app.subdomain, domain: app.domain }]