From ad935665c5b0666faba9671ff1603a9cd29f6b46 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 4 Mar 2009 17:38:23 +0000
Subject: [PATCH] Added log paths for redhat based distributions to the monitor
module.
---
install/tpl/server.ini.master | 2 +-
.../monitor_core_module.inc.php | 38 +++++++++++++------
2 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/install/tpl/server.ini.master b/install/tpl/server.ini.master
index cb6530665..481c9fd0d 100644
--- a/install/tpl/server.ini.master
+++ b/install/tpl/server.ini.master
@@ -46,4 +46,4 @@ fastcgi_bin=/usr/bin/php-cgi
[jailkit]
jailkit_chroot_home=/home/[username]
jailkit_chroot_app_sections=basicshell editors extendedshell netutils ssh sftp scp groups jk_lsh
-jailkit_chroot_app_programs=/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico
+jailkit_chroot_app_programs=/usr/bin/groups /usr/bin/id /usr/bin/dircolors /usr/bin/lesspipe /usr/bin/basename /usr/bin/dirname /usr/bin/nano /usr/bin/pico
\ No newline at end of file
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index 33853029f..d2e42a68a 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -1174,33 +1174,49 @@ class monitor_core_module {
function _getLogData($log){
- switch($log) {
+
+ $dist = '';
+ $logfile = '';
+
+ if(@is_file('/etc/debian_version')) $dist = 'debian';
+ if(@is_file('/etc/redhat-release')) $dist = 'redhat';
+
+ switch($log) {
case 'log_mail':
- $logfile = '/var/log/mail.log';
+ if($dist == 'debian') $logfile = '/var/log/mail.log';
+ if($dist == 'redhat') $logfile = '/var/log/maillog';
break;
case 'log_mail_warn':
- $logfile = '/var/log/mail.warn';
+ if($dist == 'debian') $logfile = '/var/log/mail.warn';
+ if($dist == 'redhat') $logfile = '/var/log/maillog';
break;
case 'log_mail_err':
- $logfile = '/var/log/mail.err';
+ if($dist == 'debian') $logfile = '/var/log/mail.err';
+ if($dist == 'redhat') $logfile = '/var/log/maillog';
break;
case 'log_messages':
- $logfile = '/var/log/messages';
+ if($dist == 'debian') $logfile = '/var/log/messages';
+ if($dist == 'redhat') $logfile = '/var/log/messages';
break;
case 'log_ispc_cron':
- $logfile = '/var/log/ispconfig/cron.log';
+ if($dist == 'debian') $logfile = '/var/log/ispconfig/cron.log';
+ if($dist == 'redhat') $logfile = '/var/log/ispconfig/cron.log';
break;
case 'log_freshclam':
- $logfile = '/var/log/clamav/freshclam.log';
+ if($dist == 'debian') $logfile = '/var/log/clamav/freshclam.log';
+ if($dist == 'redhat') $logfile = '/var/log/freshclam.log';
break;
case 'log_clamav':
- $logfile = '/var/log/clamav/clamav.log';
+ if($dist == 'debian') $logfile = '/var/log/clamav/clamav.log';
+ if($dist == 'redhat') $logfile = '/var/log/maillog';
break;
case 'log_fail2ban':
- $logfile = '/var/log/fail2ban.log';
+ if($dist == 'debian') $logfile = '/var/log/fail2ban.log';
+ if($dist == 'redhat') $logfile = '/var/log/fail2ban.log';
break;
case 'log_ispconfig':
- $logfile = '/var/log/ispconfig/ispconfig.log';
+ if($dist == 'debian') $logfile = '/var/log/ispconfig/ispconfig.log';
+ if($dist == 'redhat') $logfile = '/var/log/ispconfig/ispconfig.log';
break;
default:
$logfile = '';
@@ -1210,7 +1226,7 @@ class monitor_core_module {
// Getting the logfile content
if($logfile != '') {
$logfile = escapeshellcmd($logfile);
- if(stristr($logfile, ';')) {
+ if(stristr($logfile, ';') or substr($logfile,0,9) != '/var/log/' or (stristr($logfile, '..')) {
$log = 'Logfile path error.';
}
else
--
GitLab