From 58c2101b86f81dcc6f2cf2b24fa0ff1f039f067d Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 22 Jun 2010 08:47:20 -0400
Subject: [PATCH] Implemented: FS#903 - Awstats instead Webalizer
---
server/plugins-available/apache2_plugin.inc.php | 42 +++++++++++++++++++++
server/cron_daily.php | 78 +++++++++++++++++++++++++++++---------
2 files changed, 101 insertions(+), 19 deletions(-)
diff --git a/server/cron_daily.php b/server/cron_daily.php
index 766d6ab..5b731ba 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -38,7 +38,7 @@
// Load required base-classes
-$app->uses('ini_parser,file,services');
+$app->uses('ini_parser,file,services,getconf');
#######################################################################################################
@@ -112,7 +112,7 @@
}
-$sql = "SELECT domain_id, domain, document_root FROM web_domain WHERE server_id = ".$conf["server_id"];
+$sql = "SELECT domain_id, domain, document_root FROM web_domain WHERE stats_type = 'webalizer' AND server_id = ".$conf["server_id"];
$records = $app->db->queryAllRecords($sql);
foreach($records as $rec) {
@@ -120,33 +120,73 @@
$logfile = escapeshellcmd($rec["document_root"].'/log/'.$yesterday.'-access.log');
if(!@is_file($logfile)) {
$logfile = escapeshellcmd($rec["document_root"].'/log/'.$yesterday.'-access.log.gz');
- if(!@is_file($logfile)) {
- continue;
+ if(!@is_file($logfile)) {
+ continue;
+ }
}
-}
-$domain = escapeshellcmd($rec["domain"]);
-$statsdir = escapeshellcmd($rec["document_root"].'/web/stats');
-$webalizer = '/usr/bin/webalizer';
-$webalizer_conf_main = '/etc/webalizer/webalizer.conf';
-$webalizer_conf = escapeshellcmd($rec["document_root"].'/log/webalizer.conf');
+ $domain = escapeshellcmd($rec["domain"]);
+ $statsdir = escapeshellcmd($rec["document_root"].'/web/stats');
+ $webalizer = '/usr/bin/webalizer';
+ $webalizer_conf_main = '/etc/webalizer/webalizer.conf';
+ $webalizer_conf = escapeshellcmd($rec["document_root"].'/log/webalizer.conf');
-if(!@is_file($webalizer_conf)) {
- exec("cp $webalizer_conf_main $webalizer_conf");
-}
+ if(!@is_file($webalizer_conf)) {
+ exec("cp $webalizer_conf_main $webalizer_conf");
+ }
-if(@is_file($webalizer_conf)) {
- setConfigVar($webalizer_conf, 'Incremental', 'yes');
- setConfigVar($webalizer_conf, 'IncrementalName', $statsdir.'/webalizer.current');
- setConfigVar($webalizer_conf, 'HistoryName', $statsdir.'/webalizer.hist');
-}
+ if(@is_file($webalizer_conf)) {
+ setConfigVar($webalizer_conf, 'Incremental', 'yes');
+ setConfigVar($webalizer_conf, 'IncrementalName', $statsdir.'/webalizer.current');
+ setConfigVar($webalizer_conf, 'HistoryName', $statsdir.'/webalizer.hist');
+ }
-if(!@is_dir($statsdir)) mkdir($statsdir);
+ if(!@is_dir($statsdir)) mkdir($statsdir);
exec("$webalizer -c $webalizer_conf -n $domain -s $domain -r $domain -q -T -p -o $statsdir $logfile");
}
#######################################################################################################
+// Create awstats statistics
+#######################################################################################################
+
+$sql = "SELECT domain_id, domain, document_root FROM web_domain WHERE stats_type = 'awstats' AND server_id = ".$conf["server_id"];
+$records = $app->db->queryAllRecords($sql);
+
+$web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
+
+foreach($records as $rec) {
+ $yesterday = date("Ymd",time() - 86400);
+ $logfile = escapeshellcmd($rec["document_root"].'/log/'.$yesterday.'-access.log');
+ if(!@is_file($logfile)) {
+ $logfile = escapeshellcmd($rec["document_root"].'/log/'.$yesterday.'-access.log.gz');
+ if(!@is_file($logfile)) {
+ continue;
+ }
+ }
+
+ $domain = escapeshellcmd($rec["domain"]);
+ $statsdir = escapeshellcmd($rec["document_root"].'/web/stats');
+ $awstats_pl = $web_config['awstats_pl'];
+ $awstats_updateall_pl = $web_config['awstats_updateall_pl'];
+
+
+ if(!@is_dir($statsdir)) mkdir($statsdir);
+
+ // awstats_buildstaticpages.pl -update -config=mydomain.com -lang=en -dir=/var/www/domain.com/web/stats -awstatsprog=/path/to/awstats.pl
+ $command = "$awstats_updateall_pl -update -config='$domain' -lang=en -dir='$statsdir' -awstatsprog='$awstats_pl'";
+
+ if($awstats_pl != '' && $awstats_updateall_pl != '' && fileowner($awstats_pl) == 0 && fileowner($awstats_updateall_pl) == 0) {
+ exec($command);
+ $app->log("Created awstats statistics with command: $command",LOGLEVEL_DEBUG);
+ } else {
+ $app->log("No awstats statistics created. Either $awstats_pl or $awstats_updateall_pl is not owned by root user.",LOGLEVEL_WARN);
+ }
+
+}
+
+
+#######################################################################################################
// Make the web logfiles directories world readable to enable ftp access
#######################################################################################################
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 0ee377f..0a77038 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -838,6 +838,11 @@
unset($htp_file);
}
}
+
+ //* Create awstats configuration
+ if($data["new"]["stats_type"] == 'awstats' && $data["new"]["type"] == "vhost") {
+ $this->awstats_update($data,$web_config);
+ }
if($apache_chrooted) {
@@ -942,6 +947,11 @@
$command .= ' '.$data["old"]["system_user"];
exec($command);
if($apache_chrooted) $this->_exec("chroot ".escapeshellcmd($web_config['website_basedir'])." ".$command);
+
+ //* Remove the awstats configuration file
+ if($data["old"]["stats_type"] == 'awstats') {
+ $this->awstats_delete($data,$web_config);
+ }
}
}
@@ -1196,6 +1206,38 @@
file_put_contents($fileName, $output);
}
+
+ //* Update the awstats configuration file
+ private function awstats_update ($data,$web_config) {
+ global $app;
+
+ if(!@is_file($awstats_conf_dir."/awstats.".$data["new"]["domain"].".conf") || ($data["old"]["domain"] != '' && $data["new"]["domain"] != $data["old"]["domain"])) {
+ if ( @is_file($awstats_conf_dir."/awstats.".$data["old"]["domain"].".conf") ) {
+ unlink($awstats_conf_dir."/awstats.".$data["old"]["domain"].".conf");
+ }
+
+ $content = '';
+ $content .= "Include '".$awstats_conf_dir."/awstats.conf'\n";
+ $content .= "LogFile='/var/log/ispconfig/httpd/".$data["new"]["domain"]."/access.log'\n";
+ $content .= "SiteDomain='".$data["new"]["domain"]."'\n";
+ $content .= "HostAliases='www.".$data["new"]["domain"]." localhost 127.0.0.1'\n";
+
+ file_put_contents($awstats_conf_dir.'/awstats.'.$data["new"]["domain"].'.conf',$content);
+ $app->log("Created awstats config file: ".$awstats_conf_dir.'/awstats.'.$data["new"]["domain"].'.conf',LOGLEVEL_DEBUG);
+ }
+ }
+
+ //* Delete the awstats configuration file
+ private function awstats_delete ($data,$web_config) {
+ global $app;
+
+ $awstats_conf_dir = $web_config['awstats_conf_dir'];
+
+ if ( @is_file($awstats_conf_dir."/awstats.".$data["old"]["domain"].".conf") ) {
+ unlink($awstats_conf_dir."/awstats.".$data["old"]["domain"].".conf");
+ $app->log("Removed awstats config file: ".$awstats_conf_dir.'/awstats.'.$data["old"]["domain"].'.conf',LOGLEVEL_DEBUG);
+ }
+ }
//* Wrapper for exec function for easier debugging
private function _exec($command) {
--
Gitblit v1.9.1