From 5bbfc1b098302671bcbf2f754efc627d50eaa5c7 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 13 Jan 2011 09:25:59 -0500
Subject: [PATCH] Added global functions library which conatins a mail functin that supports attachments and a array_merge function that merges arrays that conatain numeric keys and strings correctly.
---
server/mods-available/monitor_core_module.inc.php | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index 4392812..a29b922 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -203,8 +203,10 @@
$this->monitorMemUsage();
$this->monitorCpu();
$this->monitorServices();
- $this->monitorOpenVzHost();
- $this->monitorOpenVzUserBeancounter();
+ if(@file_exists('/proc/user_beancounters')) {
+ $this->monitorOpenVzHost();
+ $this->monitorOpenVzUserBeancounter();
+ }
$this->monitorMailLog();
$this->monitorMailWarnLog();
$this->monitorMailErrLog();
@@ -1692,13 +1694,13 @@
case 'log_freshclam':
if($dist == 'debian') { $logfile = '/var/log/clamav/freshclam.log'; }
elseif($dist == 'redhat') { $logfile = (is_file('/var/log/clamav/freshclam.log') ? '/var/log/clamav/freshclam.log' : '/var/log/freshclam.log'); }
- elseif($dist == 'suse') { $logfile = ''; }
+ elseif($dist == 'suse') { $logfile = '/var/log/freshclam.log'; }
elseif($dist == 'gentoo') { $logfile = '/var/log/clamav/freshclam.log'; }
break;
case 'log_clamav':
if($dist == 'debian') { $logfile = '/var/log/clamav/clamav.log'; }
elseif($dist == 'redhat') { $logfile = (is_file('/var/log/clamav/clamd.log') ? '/var/log/clamav/clamd.log' : '/var/log/maillog'); }
- elseif($dist == 'suse') { $logfile = ''; }
+ elseif($dist == 'suse') { $logfile = '/var/log/clamd.log'; }
elseif($dist == 'gentoo') { $logfile = '/var/log/clamav/clamd.log'; }
break;
case 'log_fail2ban':
--
Gitblit v1.9.1