From e756e7e8a99d604ef85a9630c856bc0ffae2a3f0 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 10 Jan 2012 05:16:15 -0500
Subject: [PATCH] Fixed: FS#1967 - AWStats statistics not accessible when the website uses suphp.
---
server/plugins-available/cron_plugin.inc.php | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/server/plugins-available/cron_plugin.inc.php b/server/plugins-available/cron_plugin.inc.php
index 068dc35..d1e31d1 100644
--- a/server/plugins-available/cron_plugin.inc.php
+++ b/server/plugins-available/cron_plugin.inc.php
@@ -133,6 +133,14 @@
exec("setquota -T -u $username 604800 604800 -a &> /dev/null");
}
+ //TODO : change this when distribution information has been integrated into server record
+ //* Gentoo requires a user to be part of the crontab group.
+ if (file_exists('/etc/gentoo-release')) {
+ if (strpos($app->system->get_user_groups($username), 'crontab') === false) {
+ $app->system->add_user_to_group('crontab', $username);
+ }
+ }
+
// make temp directory writable for the apache and website users
chmod(escapeshellcmd($parent_domain["document_root"].'/tmp'), 0777);
@@ -183,11 +191,15 @@
$chr_cmd_count = 0;
//* read all active cron jobs from database and write them to file
- $cron_jobs = $app->db->queryAllRecords("SELECT `run_min`, `run_hour`, `run_mday`, `run_month`, `run_wday`, `command`, `type` FROM `cron` WHERE `parent_domain_id` = ".intval($this->parent_domain["domain_id"]) . " AND `active` = 'y'");
+ $cron_jobs = $app->db->queryAllRecords("SELECT c.`run_min`, c.`run_hour`, c.`run_mday`, c.`run_month`, c.`run_wday`, c.`command`, c.`type`, `web_domain`.`domain` as `domain` FROM `cron` as c INNER JOIN `web_domain` ON `web_domain`.`domain_id` = c.`parent_domain_id` WHERE c.`parent_domain_id` = ".intval($this->parent_domain["domain_id"]) . " AND c.`active` = 'y'");
if($cron_jobs && count($cron_jobs) > 0) {
foreach($cron_jobs as $job) {
- $command = "{$job['run_min']}\t{$job['run_hour']}\t{$job['run_mday']}\t{$job['run_month']}\t{$job['run_wday']}";
- $command .= "\t{$this->parent_domain['system_user']}"; //* running as user
+ if($job['run_month'] == '@reboot') {
+ $command = "@reboot";
+ } else {
+ $command = "{$job['run_min']}\t{$job['run_hour']}\t{$job['run_mday']}\t{$job['run_month']}\t{$job['run_wday']}";
+ }
+ $command .= "\t{$this->parent_domain['system_user']}"; //* running as user
if($job['type'] == 'url') {
$command .= "\t{$cron_config['wget']} -q -O /dev/null " . escapeshellarg($job['command']) . " >/dev/null 2>&1";
} else {
@@ -204,16 +216,22 @@
}
if($job['type'] == 'chrooted') {
- $chr_cron_content .= $command . "\n";
+ $chr_cron_content .= $command . "\t#{$job['domain']}\n";
$chr_cmd_count++;
} else {
- $cron_content .= $command . "\n";
+ $cron_content .= $command . "\t#{$job['domain']}\n";
$cmd_count++;
}
}
}
$cron_file = escapeshellcmd($cron_config["crontab_dir"].'/ispc_'.$this->parent_domain["system_user"]);
+ //TODO : change this when distribution information has been integrated into server record
+ //* Gentoo vixie-cron requires files to end with .cron in the cron.d directory
+ if (file_exists('/etc/gentoo-release')) {
+ $cron_file .= '.cron';
+ }
+
if($cmd_count > 0) {
file_put_contents($cron_file, $cron_content);
$app->log("Wrote Cron file $cron_file with content:\n$cron_content",LOGLEVEL_DEBUG);
--
Gitblit v1.9.1