tbrehm
2009-02-11 00d730a9eaba6b583fc1b9344d2e158308aef07e
Fixed several getmail crontab errors in opensuse and fedora installer.
2 files modified
14 ■■■■ changed files
install/dist/lib/fedora.lib.php 7 ●●●● patch | view | raw | blame | history
install/dist/lib/opensuse.lib.php 7 ●●●● patch | view | raw | blame | history
install/dist/lib/fedora.lib.php
@@ -770,11 +770,11 @@
            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 @@
            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');
    }
}
install/dist/lib/opensuse.lib.php
@@ -789,11 +789,11 @@
            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 @@
            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');
    }
}