diff --git a/lib/configfiles/freebsd.inc.php b/lib/configfiles/freebsd.inc.php index 3aaad345..dc42b526 100644 --- a/lib/configfiles/freebsd.inc.php +++ b/lib/configfiles/freebsd.inc.php @@ -222,7 +222,7 @@ return Array( 'cron' => Array( 'label' => 'Crond (cronscript)', 'commands' => Array( - 'echo "*/5 * * * * root /usr/local/bin/php -q '.makeCorrectDir(dirname(dirname(dirname(__FILE__)))).'scripts/froxlor_master_cronjob.php" >> /etc/crontab' + 'echo "*/5 * * * * root nice -n 5 /usr/local/bin/php -q '.makeCorrectDir(dirname(dirname(dirname(__FILE__)))).'scripts/froxlor_master_cronjob.php" >> /etc/crontab' ), 'restart' => Array( '/etc/rc.d/cron restart' diff --git a/scripts/jobs/cron_traffic.php b/scripts/jobs/cron_traffic.php index 1542ac58..93c23963 100644 --- a/scripts/jobs/cron_traffic.php +++ b/scripts/jobs/cron_traffic.php @@ -228,6 +228,38 @@ while($row = $db->fetch_array($result)) } } + // logrotate speciallogfiles + if(isset($speciallogfile_domainlist[$row['customerid']]) + && is_array($speciallogfile_domainlist[$row['customerid']]) + && count($speciallogfile_domainlist[$row['customerid']]) != 0) + { + reset($speciallogfile_domainlist[$row['customerid']]); + foreach($speciallogfile_domainlist[$row['customerid']] as $domainid => $domain) + { + $fh = fopen($logrotatefile, 'w'); + + $logconf = '# ' . basename($logrotatefile) . "\n" . '# Created ' . date('d.m.Y H:i') . "\n" . + $settings['system']['logfiles_directory'] . $row['loginname'] .'-' . $domain . '-access.log ' . + $settings['system']['logfiles_directory'] . $row['loginname'] .'-' . $domain . '-error.log {' . "\n" . + $settings['system']['logrotate_interval'] . "\n" . + 'missingok' . "\n" . + 'rotate ' . $settings['system']['logrotate_keep'] . "\n" . + 'compress' . "\n" . + 'delaycompress' . "\n" . + 'notifempty' . "\n" . + 'create' . "\n" . + '}' . "\n"; + + fwrite($fh, $logconf); + fclose($fh); + + safe_exec(escapeshellcmd($settings['system']['logrotate_binary']) . ' ' . $logrotatefile); + + fwrite($debugHandler, ' apache::reload: reloading apache' . "\n"); + safe_exec(escapeshellcmd($settings['system']['apachereload_command'])); + } + } + reset($domainlist[$row['customerid']]); if($settings['system']['mod_log_sql'] == 1) diff --git a/templates/misc/configfiles/debian_lenny/cron/etc_cron.d_froxlor b/templates/misc/configfiles/debian_lenny/cron/etc_cron.d_froxlor index 3ab32dd7..86a93796 100644 --- a/templates/misc/configfiles/debian_lenny/cron/etc_cron.d_froxlor +++ b/templates/misc/configfiles/debian_lenny/cron/etc_cron.d_froxlor @@ -5,4 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin # # Regular cron jobs for the froxlor package # -*/5 * * * * root /usr/bin/php5 -q scripts/froxlor_master_cronjob.php +*/5 * * * * root nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/debian_squeeze/cron/etc_cron.d_froxlor b/templates/misc/configfiles/debian_squeeze/cron/etc_cron.d_froxlor index 3ab32dd7..86a93796 100644 --- a/templates/misc/configfiles/debian_squeeze/cron/etc_cron.d_froxlor +++ b/templates/misc/configfiles/debian_squeeze/cron/etc_cron.d_froxlor @@ -5,4 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin # # Regular cron jobs for the froxlor package # -*/5 * * * * root /usr/bin/php5 -q scripts/froxlor_master_cronjob.php +*/5 * * * * root nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor b/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor index a36afcd2..da444fed 100644 --- a/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor +++ b/templates/misc/configfiles/gentoo/cron/etc_cron.d_froxlor @@ -7,4 +7,4 @@ PATH=/sbin:/bin:/usr/sbin:/usr/bin # # Please check that all following paths are correct # -*/5 * * * * root /usr/bin/php -q scripts/froxlor_master_cronjob.php +*/5 * * * * root nice -n 5 /usr/bin/php -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/sle_10/cron/etc_cron.d_froxlor b/templates/misc/configfiles/sle_10/cron/etc_cron.d_froxlor index 3ab32dd7..86a93796 100644 --- a/templates/misc/configfiles/sle_10/cron/etc_cron.d_froxlor +++ b/templates/misc/configfiles/sle_10/cron/etc_cron.d_froxlor @@ -5,4 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin # # Regular cron jobs for the froxlor package # -*/5 * * * * root /usr/bin/php5 -q scripts/froxlor_master_cronjob.php +*/5 * * * * root nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/ubuntu_hardy/cron/etc_cron.d_froxlor b/templates/misc/configfiles/ubuntu_hardy/cron/etc_cron.d_froxlor index 3ab32dd7..86a93796 100644 --- a/templates/misc/configfiles/ubuntu_hardy/cron/etc_cron.d_froxlor +++ b/templates/misc/configfiles/ubuntu_hardy/cron/etc_cron.d_froxlor @@ -5,4 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin # # Regular cron jobs for the froxlor package # -*/5 * * * * root /usr/bin/php5 -q scripts/froxlor_master_cronjob.php +*/5 * * * * root nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/ubuntu_lucid/cron/etc_cron.d_froxlor b/templates/misc/configfiles/ubuntu_lucid/cron/etc_cron.d_froxlor index 3ab32dd7..86a93796 100644 --- a/templates/misc/configfiles/ubuntu_lucid/cron/etc_cron.d_froxlor +++ b/templates/misc/configfiles/ubuntu_lucid/cron/etc_cron.d_froxlor @@ -5,4 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin # # Regular cron jobs for the froxlor package # -*/5 * * * * root /usr/bin/php5 -q scripts/froxlor_master_cronjob.php +*/5 * * * * root nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php diff --git a/templates/misc/configfiles/ubuntu_precise/cron/etc_cron.d_froxlor b/templates/misc/configfiles/ubuntu_precise/cron/etc_cron.d_froxlor index 3ab32dd7..86a93796 100644 --- a/templates/misc/configfiles/ubuntu_precise/cron/etc_cron.d_froxlor +++ b/templates/misc/configfiles/ubuntu_precise/cron/etc_cron.d_froxlor @@ -5,4 +5,4 @@ PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin # # Regular cron jobs for the froxlor package # -*/5 * * * * root /usr/bin/php5 -q scripts/froxlor_master_cronjob.php +*/5 * * * * root nice -n 5 /usr/bin/php5 -q scripts/froxlor_master_cronjob.php