From ed30c60150ffda0301eb1f8d30c93cac94de41df Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Mon, 25 Jul 2011 10:38:22 -0400
Subject: [PATCH] Fixed some warnings in the installer.
---
server/cron_daily.php | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/server/cron_daily.php b/server/cron_daily.php
index b736215..2d12f2c 100644
--- a/server/cron_daily.php
+++ b/server/cron_daily.php
@@ -116,7 +116,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 +157,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');
@@ -392,6 +394,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
#######################################################################################################
--
Gitblit v1.9.1