From a014c2c43f18e57b365ecf299554b3e2abfae2a4 Mon Sep 17 00:00:00 2001
From: daniel <daniel@ispconfig3>
Date: Sun, 08 Jun 2008 10:29:54 -0400
Subject: [PATCH] Updated installer to not ask for fastcgi support. Added fastcgi support by default into the ISPConfig vhost. Copies over the fastcgi starter script into /usr/local/ispconfig/interface/bin/
---
install/lib/installer_base.lib.php | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index daef564..42325db 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -624,7 +624,7 @@
if ($dh = opendir($dir)) {
while (($file = readdir($dh)) !== false) {
if($file != '.' && $file != '..') {
- if(!is_link($install_dir.'/server/mods-enabled/'.$file)) symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-enabled/'.$file);
+ if(!@is_link($install_dir.'/server/mods-enabled/'.$file)) @symlink($install_dir.'/server/mods-available/'.$file, $install_dir.'/server/mods-enabled/'.$file);
}
}
closedir($dh);
@@ -636,7 +636,7 @@
if ($dh = opendir($dir)) {
while (($file = readdir($dh)) !== false) {
if($file != '.' && $file != '..') {
- if(!is_link($install_dir.'/server/plugins-enabled/'.$file)) symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-enabled/'.$file);
+ if(!@is_link($install_dir.'/server/plugins-enabled/'.$file)) @symlink($install_dir.'/server/plugins-available/'.$file, $install_dir.'/server/plugins-enabled/'.$file);
}
}
closedir($dh);
@@ -691,7 +691,15 @@
// TODO: These are missing! should they be "vhost_dist_*_dir" ?
$vhost_conf_dir = $this->conf['apache']['vhost_conf_dir'];
$vhost_conf_enabled_dir = $this->conf['apache']['vhost_conf_enabled_dir'];
- copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
+
+
+ // Dont just copy over the virtualhost template but add some custom settings
+
+ $content = rf("tpl/apache_ispconfig.vhost.master");
+ $content = str_replace('{vhost_port}', $this->conf['apache']['vhost_port'], $content);
+ wf("$vhost_conf_dir/ispconfig.vhost", $content);
+
+ //copy('tpl/apache_ispconfig.vhost.master', "$vhost_conf_dir/ispconfig.vhost");
//* and create the symlink
if(!is_link("$vhost_conf_enabled_dir/ispconfig.vhost")) {
exec("ln -s $vhost_conf_dir/ispconfig.vhost $vhost_conf_enabled_dir/ispconfig.vhost");
@@ -706,6 +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');
}
public function install_crontab()
--
Gitblit v1.9.1