From e38d145b1b5392e9a88101f7dd5a31173e4cfa90 Mon Sep 17 00:00:00 2001 From: jwarnier <jwarnier@ispconfig3> Date: Fri, 24 Sep 2010 21:26:50 -0400 Subject: [PATCH] - setup and use $conf['ispconfig_log_dir'], somehow replacing ISPC_LOG_PATH/$conf['logpath'] - replace double-quotes with single-quotes whenever appropriate - fix indentation --- install/lib/installer_base.lib.php | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index bd4dbe3..abc0ff6 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -963,7 +963,7 @@ global $conf; //* Create the logging directory for the vhost logfiles - mkdir('/var/log/ispconfig/httpd', 0755, true); + mkdir($conf['ispconfig_log_dir'].'/httpd', 0755, true); if(is_file('/etc/suphp/suphp.conf')) { replaceLine('/etc/suphp/suphp.conf','php=php:/usr/bin','x-httpd-suphp="php:/usr/bin/php-cgi"',0); @@ -1470,10 +1470,10 @@ if(@is_file('/var/log/clamav/clamav.log')) exec('chmod +r /var/log/clamav/clamav.log'); if(@is_file('/var/log/clamav/freshclam.log')) exec('chmod +r /var/log/clamav/freshclam.log'); - //* Create the ispconfig log directory - if(!is_file('/var/log/ispconfig/ispconfig.log')) { - if(!is_dir('/var/log/ispconfig')) mkdir('/var/log/ispconfig', 0755); - touch('/var/log/ispconfig/ispconfig.log'); + //* Create the ispconfig log file and directory + if(!is_file($conf['ispconfig_log_dir'].'/ispconfig.log')) { + if(!is_dir($conf['ispconfig_log_dir'])) mkdir($conf['ispconfig_log_dir'], 0755); + touch($conf['ispconfig_log_dir'].'/ispconfig.log'); } rename($install_dir.'/server/scripts/run-getmail.sh','/usr/local/bin/run-getmail.sh'); @@ -1486,14 +1486,14 @@ /* We rotate these logs in cron_daily.php $fh = fopen('/etc/logrotate.d/logispc3', 'w'); fwrite($fh, - "/var/log/ispconfig/ispconfig.log { \n" . + "$conf['ispconfig_log_dir']/ispconfig.log { \n" . " weekly \n" . " missingok \n" . " rotate 4 \n" . " compress \n" . " delaycompress \n" . "} \n" . - "/var/log/ispconfig/cron.log { \n" . + "$conf['ispconfig_log_dir']/cron.log { \n" . " weekly \n" . " missingok \n" . " rotate 4 \n" . @@ -1544,8 +1544,8 @@ } $root_cron_jobs = array( - "* * * * * $install_dir/server/server.sh > /dev/null 2>> /var/log/ispconfig/cron.log", - "30 00 * * * $install_dir/server/cron_daily.sh > /dev/null 2>> /var/log/ispconfig/cron.log" + "* * * * * $install_dir/server/server.sh > /dev/null 2>> $conf['ispconfig_log_dir']/cron.log", + "30 00 * * * $install_dir/server/cron_daily.sh > /dev/null 2>> $conf['ispconfig_log_dir']/cron.log" ); foreach($root_cron_jobs as $cron_job) { if(!in_array($cron_job."\n", $existing_root_cron_jobs)) { @@ -1563,7 +1563,7 @@ $existing_cron_jobs = file('crontab.txt'); $cron_jobs = array( - '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> /var/log/ispconfig/cron.log' + '*/5 * * * * /usr/local/bin/run-getmail.sh > /dev/null 2>> $conf['ispconfig_log_dir']/cron.log' ); // remove existing ispconfig cronjobs, in case the syntax has changed @@ -1581,8 +1581,8 @@ unlink('crontab.txt'); } - touch('/var/log/ispconfig/cron.log'); - chmod('/var/log/ispconfig/cron.log', 0666); + touch($conf['ispconfig_log_dir'].'/cron.log'); + chmod($conf['ispconfig_log_dir'].'/cron.log', 0666); } -- Gitblit v1.9.1