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

fold sysinfo into network

Browse Source 
the backends are network backends
This commit is contained in:
Girish Ramakrishnan
2023-08-03 13:38:42 +05:30
parent a4d57e7b08
commit 47d57a3971
23 changed files with 143 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mail.js
View File

@@ -88,6 +88,7 @@ const assert = require('assert'),
mailer = require('./mailer.js'),
mysql = require('mysql'),
net = require('net'),
network = require('./network.js'),
nodemailer = require('nodemailer'),
os = require('os'),
path = require('path'),
@@ -98,7 +99,6 @@ const assert = require('assert'),
settings = require('./settings.js'),
shell = require('./shell.js'),
superagent = require('superagent'),
sysinfo = require('./sysinfo.js'),
system = require('./system.js'),
tasks = require('./tasks.js'),
users = require('./users.js'),
@@ -375,7 +375,7 @@ async function checkMx(domain, mailFqdn) {
const [error2, mxIps] = await safe(dig.resolve(mxRecords[0].exchange, 'A', DNS_OPTIONS));
if (error2 || mxIps.length !== 1) return mx;
const [error3, ip] = await safe(sysinfo.getServerIPv4());
const [error3, ip] = await safe(network.getIPv4());
if (error3) return mx;
mx.status = mxIps[0] === ip;
@@ -433,7 +433,7 @@ async function checkPtr(mailFqdn) {
errorMessage: ''
};
const [error, ip] = await safe(sysinfo.getServerIPv4());
const [error, ip] = await safe(network.getIPv4());
if (error) {
ptr.errorMessage = error.message;
return ptr;
@@ -513,7 +513,7 @@ const RBL_LIST = [
// this function currently only looks for black lists based on IP. TODO: also look up by domain
async function checkRblStatus(domain) {
const [error, ip] = await safe(sysinfo.getServerIPv4());
const [error, ip] = await safe(network.getIPv4());
if (error) {
debug(`checkRblStatus: unable to determine server IPv4: ${error.message}`);
return { status: false, ip: null, servers: [] };