From 76f1973448c7dc481f0cf2b1d2b02d9a65c4066c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 27 Feb 2009 11:54:01 -0500
Subject: [PATCH] Fixed centos installer bugs.
---
install/dist/lib/fedora.lib.php | 20 ++++++++++++++++++--
install/lib/install.lib.php | 2 +-
2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 7a52fbd..24dd8fe 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -687,6 +687,22 @@
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");
}
+
+ 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');
+ exec('ln -s /usr/local/ispconfig/interface/web /var/www/ispconfig');
+ exec('chown -R ispconfig:ispconfig /var/www/php-fcgi-scripts/ispconfig');
+
+ }
+
+ //copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
+ //* and create the symlink
+ if($this->install_ispconfig_interface == true && $this->is_update == false) {
+ if(@is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) unlink("$vhost_conf_enabled_dir/ispconfig.vhost");
+ 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");
+ }
}
// Make the Clamav log files readable by ISPConfig
@@ -698,8 +714,8 @@
exec('chown root /usr/local/bin/ispconfig_update_from_svn.sh');
exec('chmod 700 /usr/local/bin/ispconfig_update_from_svn.sh');
- //set the fast cgi starter script to executable
- exec('chmod 755 '.$install_dir.'/interface/bin/php-fcgi');
+ // set the fast cgi starter script to executable
+ // exec('chmod 755 '.$install_dir.'/interface/bin/php-fcgi');
//* Make the logs readable for the ispconfig user
if(@is_file('/var/log/maillog')) exec('chmod +r /var/log/maillog');
diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index 4af0d54..23e27b2 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -558,7 +558,7 @@
}
function is_installed($appname) {
- exec('which '.escapeshellcmd($appname),$out);
+ exec('which '.escapeshellcmd($appname).' > /dev/null 2> /dev/null',$out);
if(isset($out[0]) && stristr($out[0],$appname)) {
return true;
} else {
--
Gitblit v1.9.1