tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 08:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ent-8978-derivado-del-trabajo-q-a-762-lts-servidores-pfms-sin-dig-ni-y-o-whois-instalado' into 'develop'

Browse Source 
Ent 8978 derivado del trabajo q a 762 lts servidores pfms sin dig ni y o whois instalado

See merge request artica/pandorafms!5082
This commit is contained in:
Daniel Rodriguez 2022-09-22 08:21:41 +00:00
commit c34328583f
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extras/deploy-scripts/pandora_deploy_community.sh
View File

@ -282,6 +282,8 @@ server_dependencies=" \
expect \ expect \
openssh-clients \ openssh-clients \
java \ java \
bind-utils \
whois \
http://firefly.artica.es/centos7/xprobe2-0.3-12.2.x86_64.rpm \ http://firefly.artica.es/centos7/xprobe2-0.3-12.2.x86_64.rpm \
http://firefly.artica.es/centos7/wmic-1.4-1.el7.x86_64.rpm \ http://firefly.artica.es/centos7/wmic-1.4-1.el7.x86_64.rpm \
https://firefly.artica.es/centos7/pandorawmic-1.0.0-1.x86_64.rpm" https://firefly.artica.es/centos7/pandorawmic-1.0.0-1.x86_64.rpm"

2
extras/deploy-scripts/pandora_deploy_community_el8.sh
View File

@ -338,6 +338,8 @@ server_dependencies=" \
expect \ expect \
openssh-clients \ openssh-clients \
java \ java \
bind-utils \
whois \
http://firefly.artica.es/centos7/xprobe2-0.3-12.2.x86_64.rpm \ http://firefly.artica.es/centos7/xprobe2-0.3-12.2.x86_64.rpm \
http://firefly.artica.es/centos7/wmic-1.4-1.el7.x86_64.rpm \ http://firefly.artica.es/centos7/wmic-1.4-1.el7.x86_64.rpm \
https://firefly.artica.es/centos8/pandorawmic-1.0.0-1.x86_64.rpm" https://firefly.artica.es/centos8/pandorawmic-1.0.0-1.x86_64.rpm"

8
pandora_console/include/class/ExternalTools.class.php
View File

@ -651,6 +651,12 @@ class ExternalTools extends HTML
} }
break; break;
case 'whois':
if (empty($snmpget_path) === false) {
return $snmpget_path;
}
break;
default: default:
return null; return null;
} }
@ -829,6 +835,7 @@ class ExternalTools extends HTML
if (empty($dig) === true) { if (empty($dig) === true) {
ui_print_error_message(__('Dig executable does not exist.')); ui_print_error_message(__('Dig executable does not exist.'));
} else { } else {
$dig .= ' '.$ip;
$this->performExecution($dig); $this->performExecution($dig);
} }
@ -837,6 +844,7 @@ class ExternalTools extends HTML
if (empty($whois) === true) { if (empty($whois) === true) {
ui_print_error_message(__('Whois executable does not exist.')); ui_print_error_message(__('Whois executable does not exist.'));
} else { } else {
$whois .= ' '.$ip;
$this->performExecution($whois); $this->performExecution($whois);
} }