From 4c7fd5c32c2bd0d8dd18543ea10f930aca0a7843 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 04 Mar 2009 10:26:57 -0500
Subject: [PATCH]
---
install/lib/installer_base.lib.php | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index de3c5fd..13a3c92 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -702,8 +702,8 @@
}
if(is_file('/etc/apache2/sites-enabled/000-default')) {
- replaceLine('/etc/apache2/sites-available/000-default','NameVirtualHost *','NameVirtualHost *:80',1);
- replaceLine('/etc/apache2/sites-available/000-default','<VirtualHost *>','<VirtualHost *:80>',1);
+ replaceLine('/etc/apache2/sites-available/000-default','NameVirtualHost *','NameVirtualHost *:80',1,0);
+ replaceLine('/etc/apache2/sites-available/000-default','<VirtualHost *>','<VirtualHost *:80>',1,0);
}
if(is_file('/etc/apache2/ports.conf')) {
@@ -991,7 +991,8 @@
if(!@is_link("$vhost_conf_enabled_dir/000-ispconfig.vhost")) {
exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/000-ispconfig.vhost");
}
-
+ }
+ if(!is_file('/var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter')) {
exec('mkdir -p /var/www/php-fcgi-scripts/ispconfig');
exec('cp tpl/apache_ispconfig_fcgi_starter.master /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
exec('chmod +x /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter');
@@ -999,10 +1000,6 @@
exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
}
-
- // Make the Clamav log files readable by ISPConfig
- exec('chmod +r /var/log/clamav/clamav.log');
- exec('chmod +r /var/log/clamav/freshclam.log');
//* Install the SVN update script
exec('cp ../helper_scripts/update_from_svn.sh /usr/local/bin/ispconfig_update_from_svn.sh');
@@ -1014,6 +1011,8 @@
if(@is_file('/var/log/mail.warn')) exec('chmod +r /var/log/mail.warn');
if(@is_file('/var/log/mail.err')) exec('chmod +r /var/log/mail.err');
if(@is_file('/var/log/messages')) exec('chmod +r /var/log/messages');
+ 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_dir('/var/log/ispconfig')) mkdir('/var/log/ispconfig');
@@ -1098,7 +1097,7 @@
}
exec('touch /var/log/ispconfig/cron.log');
- exec('chmod +666 /var/log/ispconfig/cron.log');
+ exec('chmod 666 /var/log/ispconfig/cron.log');
}
--
Gitblit v1.9.1