From b78ed72e259481da503f5d27b7126f6d920fff67 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 26 Dec 2010 06:10:37 -0500
Subject: [PATCH] - Added missing logfile definitions for clamav logs in monitor. - Fixed a bug in awstats statistics.
---
server/mods-available/monitor_core_module.inc.php | 4 ++--
server/cron_daily.php | 11 +++++++----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/server/cron_daily.php b/server/cron_daily.php
index c511178..f445551 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -173,19 +173,22 @@
$awstats_conf_dir = $web_config['awstats_conf_dir'];
$awstats_website_conf_file = $web_config['awstats_conf_dir'].'/awstats.'.$domain.'.conf';
+ if(is_file($awstats_website_conf_file)) unlink($awstats_website_conf_file);
+
if(!is_file($awstats_website_conf_file)) {
$awstats_conf_file_content = 'Include "'.$awstats_conf_dir.'/awstats.conf"
-LogFile="/var/log/ispconfig/httpd/'.$domain.'/access.log"
+LogFile="/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log"
SiteDomain="'.$domain.'"
HostAliases="www.'.$domain.' localhost 127.0.0.1"';
file_put_contents($awstats_website_conf_file,$awstats_conf_file_content);
}
-
if(!@is_dir($statsdir)) mkdir($statsdir);
+ if(is_file('/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log')) unlink('/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log');
+ symlink($logfile,'/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log');
// awstats_buildstaticpages.pl -update -config=mydomain.com -lang=en -dir=/var/www/domain.com/web/stats -awstatsprog=/path/to/awstats.pl
- $command = "$awstats_buildstaticpages_pl -update -LogFile='$logfile' -config='$domain' -lang=en -dir='$statsdir' -awstatsprog='$awstats_pl'";
+ $command = "$awstats_buildstaticpages_pl -update -config='$domain' -lang=en -dir='$statsdir' -awstatsprog='$awstats_pl'";
if($awstats_pl != '' && $awstats_buildstaticpages_pl != '' && fileowner($awstats_pl) == 0 && fileowner($awstats_buildstaticpages_pl) == 0) {
exec($command);
@@ -211,7 +214,7 @@
$sql = "SELECT domain_id, domain, document_root FROM web_domain WHERE server_id = ".$conf['server_id'];
$records = $app->db->queryAllRecords($sql);
foreach($records as $rec) {
- $yesterday = date('Ymd',time() - 86400);
+ $yesterday = date('Ymd',time() - 86400*2);
$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log');
if(@is_file($logfile)) {
// Compress yesterdays logfile
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index d44ef8f..8b3c893 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -1697,13 +1697,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