From 00d730a9eaba6b583fc1b9344d2e158308aef07e Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 11 Feb 2009 17:19:29 +0000
Subject: [PATCH] Fixed several getmail crontab errors in opensuse and fedora
installer.
---
install/dist/lib/fedora.lib.php | 7 +++++--
install/dist/lib/opensuse.lib.php | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 0a096e0e07..ff78351d26 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -770,11 +770,11 @@ class installer_dist extends installer_base {
exec('crontab -u getmail -l > crontab.txt');
$existing_cron_jobs = file('crontab.txt');
- $cron_jobs = array('*/5 * * * * '.$cf['program'].' -g '.$cf['config_dir'].' -r '.$cf['config_dir'].'/*.conf &> /dev/null');
+ $cron_jobs = array('*/5 * * * * '.$cf['program'].' -n -g '.$cf['config_dir'].' -r '.$cf['config_dir'].'/*.conf &> /dev/null');
// remove existing ispconfig cronjobs, in case the syntax has changed
foreach($cron_jobs as $key => $val) {
- if(stristr($val,$cf['program'])) unset($cron_jobs[$key]);
+ if(stristr($val,$cf['program'])) unset($existing_cron_jobs[$key]);
}
foreach($cron_jobs as $cron_job) {
@@ -786,6 +786,9 @@ class installer_dist extends installer_base {
exec('crontab -u getmail crontab.txt &> /dev/null');
unlink('crontab.txt');
}
+
+ exec('touch /var/log/ispconfig/cron.log');
+ exec('chmod +666 /var/log/ispconfig/cron.log');
}
}
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index c499653d80..35c765c3ca 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -789,11 +789,11 @@ class installer_dist extends installer_base {
exec('crontab -u getmail -l > crontab.txt');
$existing_cron_jobs = file('crontab.txt');
- $cron_jobs = array('*/5 * * * * '.$cf['program'].' -g '.$cf['config_dir'].' -r '.$cf['config_dir'].'/*.conf &> /dev/null');
+ $cron_jobs = array('*/5 * * * * '.$cf['program'].' -n -g '.$cf['config_dir'].' -r '.$cf['config_dir'].'/*.conf &> /dev/null');
// remove existing ispconfig cronjobs, in case the syntax has changed
foreach($cron_jobs as $key => $val) {
- if(stristr($val,$cf['program'])) unset($cron_jobs[$key]);
+ if(stristr($val,$cf['program'])) unset($existing_cron_jobs[$key]);
}
foreach($cron_jobs as $cron_job) {
@@ -805,6 +805,9 @@ class installer_dist extends installer_base {
exec('crontab -u getmail crontab.txt &> /dev/null');
unlink('crontab.txt');
}
+
+ exec('touch /var/log/ispconfig/cron.log');
+ exec('chmod +666 /var/log/ispconfig/cron.log');
}
}
--
GitLab