From 27c3a61c1164d4dbf95a2c688ce3a2b987d9e8eb Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 12 Mar 2009 13:49:22 -0400
Subject: [PATCH] Fixed getmail problem when more then one getmail account exists.

---
 install/dist/lib/opensuse.lib.php |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 9a49d30..b5b9457 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -776,6 +776,9 @@
 		if(!is_dir('/var/log/ispconfig')) mkdir('/var/log/ispconfig');
 		if(!is_file('/var/log/ispconfig/ispconfig.log')) exec('touch /var/log/ispconfig/ispconfig.log');
 		
+		exec('chown getmail /usr/local/ispconfig/server/scripts/run-getmail.sh');
+		exec('chmod 744 /usr/local/ispconfig/server/scripts/run-getmail.sh');
+		
 		
 	}
 	
@@ -835,11 +838,13 @@
 			exec('crontab -u getmail -l > crontab.txt');
 			$existing_cron_jobs = file('crontab.txt');
 		
-			$cron_jobs = array('*/5 * * * * '.$cf['program'].' -n -g '.$cf['config_dir'].' -r '.$cf['config_dir'].'/*.conf &> /dev/null');
-			
+			$cron_jobs = array(
+                '*/5 * * * * /usr/local/ispconfig/server/scripts/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log'
+            );
+		
 			// remove existing ispconfig cronjobs, in case the syntax has changed
 			foreach($cron_jobs as $key => $val) {
-				if(stristr($val,$cf['program'])) unset($existing_cron_jobs[$key]);
+				if(stristr($val,'getmail')) unset($existing_cron_jobs[$key]);
 			}
 			
 			foreach($cron_jobs as $cron_job) {

--
Gitblit v1.9.1