From 5ebfe2baecacf0d866a903a8cdcb9bf8e95e0f9f Mon Sep 17 00:00:00 2001 From: Sebastian Hildebrandt Date: Thu, 10 Jan 2019 21:18:08 +0100 Subject: [PATCH] versions: added apache --- docs/network.html | 118 +++++++++++++++++++++- docs/os.html | 252 +++++++++++++++++++++++++++++++++++++++++++++- lib/osinfo.js | 10 +- 3 files changed, 374 insertions(+), 6 deletions(-) diff --git a/docs/network.html b/docs/network.html index 62782f7..e4099a0 100644 --- a/docs/network.html +++ b/docs/network.html @@ -66,7 +66,7 @@ X X X - array of network interfaces + array of network interfaces (objects) @@ -76,7 +76,17 @@ X X X - interface name + interface + + + + [0].ifaceName + X + X + X + X + X + interface name (differs on Windows) @@ -118,6 +128,66 @@ X true if internal interface + + + [0].operstate + X + X + X + X + + up / down + + + + [0].type + X + X + X + X + + wireless / wired + + + + [0].duplex + X + X + X + X + + duplex (full/half) + + + + [0].mtu + X + X + X + X + + MUT maximum transmission unit + + + + [0].speed + X + X + X + X + + Speed in Mbit / s + + + + [0].carrierChanges + X + X + X + X + + # changes up/down + si.networkInterfaceDefault(cb) : string @@ -160,7 +230,7 @@ - rx + rx_bytes X X X @@ -170,7 +240,27 @@ - tx + rx_dropped + X + X + X + X + + received dropped overall + + + + rx_errors + X + X + X + X + + received errors overall + + + + tx_bytes X X X @@ -178,6 +268,26 @@ transferred bytes overall + + + tx_dropped + X + X + X + X + + transferred dropped overall + + + + tx_errors + X + X + X + X + + transferred errors overall + rx_sec diff --git a/docs/os.html b/docs/os.html index 9471535..f64bdb2 100644 --- a/docs/os.html +++ b/docs/os.html @@ -216,7 +216,257 @@ X X X - version information (kernel, ssl, node, ...) + version information of
node and dev software packages + + + + kernel + X + X + X + X + X + os kernel version + + + + openssl + X + X + X + X + X + node openssl version + + + + systemOpenssl + X + X + X + X + X + os openssl version + + + + systemOpensslLib + X + X + X + X + X + openSSL, LibreSSL, ... + + + + node + X + X + X + X + X + node version + + + + v8 + X + X + X + X + X + v8 version + + + + npm + X + X + X + X + X + npm version + + + + yarn + X + X + X + X + X + yarn version + + + + pm2 + X + X + X + X + X + pm2 version + + + + gulp + X + X + X + X + X + gulp version + + + + grunt + X + X + X + X + X + grunt version + + + + git + X + X + X + X + X + git version + + + + tsc + X + X + X + X + X + typescript version + + + + mysql + X + X + X + X + X + mysql version + + + + redis + X + X + X + X + X + redis version + + + + mongodb + X + X + X + X + X + mongodb version + + + + apache + X + X + X + X + X + apache version + + + + nginx + X + X + X + X + X + nginx version + + + + php + X + X + X + X + X + php version + + + + docker + X + X + X + X + X + docker version + + + + postfix + X + X + X + X + X + postfix version + + + + postgresql + X + X + X + X + X + postgresql version + + + + perl + X + X + X + X + X + perl version + + + + python + X + X + X + X + X + python version + + + + gcc + X + X + X + X + X + gcc version si.users(cb) diff --git a/lib/osinfo.js b/lib/osinfo.js index 0d91667..1bf76ce 100644 --- a/lib/osinfo.js +++ b/lib/osinfo.js @@ -295,6 +295,7 @@ function versions(callback) { mysql: '', redis: '', mongodb: '', + apache: '', nginx: '', php: '', docker: '', @@ -306,7 +307,7 @@ function versions(callback) { }; let functionProcessed = (function () { - let totalFunctions = 19; + let totalFunctions = 20; return function () { if (--totalFunctions === 0) { if (callback) { @@ -396,6 +397,13 @@ function versions(callback) { functionProcessed(); }); } + exec('apachectl -v 2>&1', function (error, stdout) { + if (!error) { + const apache = (stdout.toString().split('\n')[0] || '').split(':'); + result.apache = (apache.length > 1 ? apache[1].replace('Apache', '').replace('/', '').trim() : ''); + } + functionProcessed(); + }); exec('nginx -v 2>&1', function (error, stdout) { if (!error) { const nginx = stdout.toString().split('\n')[0] || '';