From 5ef60a7ff60d0b349e56b7681edc8679fe6cd1e0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 08 Sep 2011 08:33:09 -0400
Subject: [PATCH] Fixed: FS#1456 - Web domain's log rotate problem
---
server/cron_daily.php | 102 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 93 insertions(+), 9 deletions(-)
diff --git a/server/cron_daily.php b/server/cron_daily.php
index 8ea4395..d8a7b64 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);
@@ -177,11 +178,21 @@
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"';
+HostAliases="www.'.$domain.' localhost 127.0.0.1"'.$aliasdomain;
file_put_contents($awstats_website_conf_file,$awstats_conf_file_content);
}
@@ -189,12 +200,44 @@
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');
+ $awmonth = date("m");
+ if (date("d") == 1) {
+ $awmonth = date("m")-1;
+ }
+
+ $awyear = date("Y");
+ if (date("m") == 1) {
+ $awyear = date("Y")-1;
+ $awmonth = "12";
+ }
+
// 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'";
+
+ $command = "$awstats_buildstaticpages_pl -month='$awmonth' -year='$awyear' -update -config='$domain' -lang=".$conf['language']." -dir='$statsdir' -awstatsprog='$awstats_pl'";
+
+ if (date("d") == 2) {
+ $awmonth = date("m")-1;
+ if (date("m") == 1) {
+ $awyear = date("Y")-1;
+ $awmonth = "12";
+ }
+
+ $statsdirold = $statsdir."/".$awyear."-".$awmonth."/";
+ mkdir($statsdirold);
+ $files = scandir($statsdir);
+ foreach ($files as $file) {
+ if (substr($file,0,1) != "." && !is_dir($file) && substr($file,0,1) != "w" && substr($file,0,1) != "i") copy("$statsdir"."/"."$file","$statsdirold"."$file");
+ }
+ }
+
if($awstats_pl != '' && $awstats_buildstaticpages_pl != '' && fileowner($awstats_pl) == 0 && fileowner($awstats_buildstaticpages_pl) == 0) {
exec($command);
- rename($rec['document_root'].'/web/stats/awstats.'.$domain.'.html',$rec['document_root'].'/web/stats/index.html');
+ if(is_file($rec['document_root'].'/web/stats/index.html')) unlink($rec['document_root'].'/web/stats/index.html');
+ rename($rec['document_root'].'/web/stats/awstats.'.$domain.'.html',$rec['document_root'].'/web/stats/awsindex.html');
+ if(!is_file($rec['document_root']."/web/stats/index.php")) copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$rec['document_root']."/web/stats/index.php");
+
$app->log('Created awstats statistics with command: '.$command,LOGLEVEL_DEBUG);
} else {
$app->log("No awstats statistics created. Either $awstats_pl or $awstats_buildstaticpages_pl is not owned by root user.",LOGLEVEL_WARN);
@@ -237,6 +280,15 @@
if(@is_file($logfile)) {
unlink($logfile);
}
+
+ //* Delete older Log files, in case that we missed them before due to serverdowntimes.
+ $datepart = date('Ym',time() - 86400 * 31 * 2);
+
+ $logfile = escapeshellcmd($rec['document_root']).'/log/'.$datepart.'*-access.log.gz';
+ exec('rm -f '.$logfile);
+
+ $logfile = escapeshellcmd($rec['document_root']).'/log/'.$datepart.'*-access.log';
+ exec('rm -f '.$logfile);
}
#######################################################################################################
@@ -394,6 +446,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
#######################################################################################################
@@ -403,8 +476,16 @@
if($backup_dir != '') {
+ if(isset($server_config['backup_dir_ftpread']) && $server_config['backup_dir_ftpread'] == 'y') {
+ $backup_dir_permissions = 0755;
+ } else {
+ $backup_dir_permissions = 0750;
+ }
+
if(!is_dir($backup_dir)) {
- mkdir(escapeshellcmd($backup_dir), 0750, true);
+ mkdir(escapeshellcmd($backup_dir), $backup_dir_permissions, true);
+ } else {
+ chmod(escapeshellcmd($backup_dir), $backup_dir_permissions);
}
$sql = "SELECT * FROM web_domain WHERE type = 'vhost'";
@@ -429,9 +510,12 @@
// Rename or remove old backups
$backup_copies = intval($rec['backup_copies']);
-
- if(is_file($web_backup_dir.'/web.'.$backup_copies.'.zip')) unlink($web_backup_dir.'/web.'.$backup_copies.'.zip');
-
+
+ //* delete any older backup copies that previously existed
+ for ($n = $backup_copies; $n <= 10; $n++) {
+ if(is_file($web_backup_dir.'/web.'.$n.'.zip')) unlink($web_backup_dir.'/web.'.$n.'.zip');
+ }
+
for($n = $backup_copies - 1; $n >= 1; $n--) {
if(is_file($web_backup_dir.'/web.'.$n.'.zip')) {
rename($web_backup_dir.'/web.'.$n.'.zip',$web_backup_dir.'/web.'.($n+1).'.zip');
--
Gitblit v1.9.1