From d2f8d345e18ee7df170edbc0830612ec5ae06d10 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 06 Sep 2011 11:36:03 -0400
Subject: [PATCH] Fixed: FS#1604 - Awstats is always in english
---
server/cron_daily.php | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 11 deletions(-)
diff --git a/server/cron_daily.php b/server/cron_daily.php
index b93e099..f84601c 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -28,8 +28,9 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require('lib/config.inc.php');
-require('lib/app.inc.php');
+define('SCRIPT_PATH', dirname($_SERVER["SCRIPT_FILENAME"]));
+require(SCRIPT_PATH."/lib/config.inc.php");
+require(SCRIPT_PATH."/lib/app.inc.php");
set_time_limit(0);
@@ -92,7 +93,7 @@
$out = '';
$found = 0;
foreach($lines as $line) {
- list($key, $value) = preg_split('/[\t= ]+/', $line, 2);
+ @list($key, $value) = preg_split('/[\t= ]+/', $line, 2);
if($key == $varName) {
$out .= $varName.' '.$varValue."\n";
$found = 1;
@@ -116,7 +117,8 @@
$records = $app->db->queryAllRecords($sql);
foreach($records as $rec) {
- $yesterday = date('Ymd',time() - 86400);
+ //$yesterday = date('Ymd',time() - 86400);
+ $yesterday = date('Ymd',strtotime("-1 day", time()));
$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log');
if(!@is_file($logfile)) {
$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log.gz');
@@ -156,7 +158,8 @@
$web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
foreach($records as $rec) {
- $yesterday = date('Ymd',time() - 86400);
+ //$yesterday = date('Ymd',time() - 86400);
+ $yesterday = date('Ymd',strtotime("-1 day", time()));
$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log');
if(!@is_file($logfile)) {
$logfile = escapeshellcmd($rec['document_root'].'/log/'.$yesterday.'-access.log.gz');
@@ -170,11 +173,35 @@
$awstats_pl = $web_config['awstats_pl'];
$awstats_buildstaticpages_pl = $web_config['awstats_buildstaticpages_pl'];
+ $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);
+
+ $sql = "SELECT domain FROM web_domain WHERE (type = 'alias' OR AND type = 'subdomain') server_id = ".$conf['server_id'];
+ $aliases = $app->db->queryAllRecords($sql);
+ $aliasdomain = '';
+
+ if(is_array($aliases)) {
+ foreach ($aliases as $alias) {
+ $aliasdomain.= ' '.$alias['domain']. ' www.'.$alias['domain'];
+ }
+ }
+
+ if(!is_file($awstats_website_conf_file)) {
+ $awstats_conf_file_content = 'Include "'.$awstats_conf_dir.'/awstats.conf"
+LogFile="/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log"
+SiteDomain="'.$domain.'"
+HostAliases="www.'.$domain.' localhost 127.0.0.1"'.$aliasdomain;
+ file_put_contents($awstats_website_conf_file,$awstats_conf_file_content);
+ }
if(!@is_dir($statsdir)) mkdir($statsdir);
+ if(is_link('/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 -config='$domain' -lang=en -dir='$statsdir' -awstatsprog='$awstats_pl'";
+ $command = "$awstats_buildstaticpages_pl -update -config='$domain' -lang=".$conf['language']." -dir='$statsdir' -awstatsprog='$awstats_pl'";
if($awstats_pl != '' && $awstats_buildstaticpages_pl != '' && fileowner($awstats_pl) == 0 && fileowner($awstats_buildstaticpages_pl) == 0) {
exec($command);
@@ -200,7 +227,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
@@ -228,14 +255,14 @@
#######################################################################################################
// rotate the ispconfig.log when it exceeds a size of 10 MB
-$logfile = '/var/log/ispconfig/ispconfig.log';
+$logfile = $conf['ispconfig_log_dir'].'/ispconfig.log';
if(is_file($logfile) && filesize($logfile) > 10000000) {
exec("gzip -c $logfile > $logfile.1.gz");
exec("cat /dev/null > $logfile");
}
// rotate the cron.log when it exceeds a size of 10 MB
-$logfile = '/var/log/ispconfig/cron.log';
+$logfile = $conf['ispconfig_log_dir'].'/cron.log';
if(is_file($logfile) && filesize($logfile) > 10000000) {
exec("gzip -c $logfile > $logfile.1.gz");
exec("cat /dev/null > $logfile");
@@ -284,7 +311,7 @@
$maxId = $res['max(action_id)'];
$sql = "DELETE FROM sys_remoteaction " .
"WHERE tstamp < " . $tstamp . " " .
- " AND action_status = 'ok' " .
+ " AND action_state = 'ok' " .
" AND action_id <" . intval($maxId);
$app->dbmaster->query($sql);
@@ -378,6 +405,27 @@
}
+
+#######################################################################################################
+// deactivate virtual servers (run only on the "master-server")
+#######################################################################################################
+
+if ($app->dbmaster == $app->db) {
+ $current_date = date('Y-m-d');
+
+ //* Check which virtual machines have to be deactivated
+ $sql = "SELECT * FROM openvz_vm WHERE active = 'y' AND active_until_date != '0000-00-00' AND active_until_date < '$current_date'";
+ $records = $app->db->queryAllRecords($sql);
+ if(is_array($records)) {
+ foreach($records as $rec) {
+ $app->dbmaster->datalogUpdate('openvz_vm', "active = 'n'", 'vm_id', $rec['vm_id']);
+ $app->log('Virtual machine active date expired. Disabling VM '.$rec['veid'],LOGLEVEL_DEBUG);
+ }
+ }
+
+
+}
+
#######################################################################################################
// Create website backups
#######################################################################################################
@@ -404,7 +452,7 @@
$web_group = $rec['system_group'];
$web_id = $rec['domain_id'];
$web_backup_dir = $backup_dir.'/web'.$web_id;
- if(!is_dir($web_backup_dir)) mkdir($web_backup_dir, 0750);
+ if(!is_dir($web_backup_dir)) mkdir($web_backup_dir, 0755);
chmod($web_backup_dir, 0755);
chown($web_backup_dir, 'root');
@@ -427,6 +475,7 @@
// Create backupdir symlink
if(is_link($web_path.'/backup')) unlink($web_path.'/backup');
symlink($web_backup_dir,$web_path.'/backup');
+ chmod($web_path.'/backup', 0755);
}
--
Gitblit v1.9.1