From 0731a3df782c5a1c6cefc9da72e60a73c069012b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 27 Jan 2009 17:21:07 +0000
Subject: [PATCH] Fixed FCGI starter script for ispconfig interface.

---
 install/lib/installer_base.lib.php               | 9 ++++++---
 install/tpl/apache_ispconfig.vhost.master        | 6 +++---
 install/tpl/apache_ispconfig_fcgi_starter.master | 8 ++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 install/tpl/apache_ispconfig_fcgi_starter.master

diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 1dbf567c9..c4cabd11a 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -991,6 +991,12 @@ class installer_base {
 			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');
+			
 		}
 		
 		// Make the Clamav log files readable by ISPConfig
@@ -1002,9 +1008,6 @@ class installer_base {
 		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');
-		
 		//* Make the logs readable for the ispconfig user
 		if(@is_file('/var/log/mail.log')) exec('chmod +r /var/log/mail.log');
 		if(@is_file('/var/log/mail.warn')) exec('chmod +r /var/log/mail.warn');
diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index 69b7c221b..d37b532b0 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -12,13 +12,13 @@ NameVirtualHost *:{vhost_port}
   DocumentRoot /usr/local/ispconfig/interface/web/
   
   <IfModule mod_fastcgi.c>
-    DocumentRoot /usr/local/ispconfig/interface/web/
+    DocumentRoot /var/www/ispconfig/
     SuexecUserGroup ispconfig ispconfig
-    <Directory /usr/local/ispconfig/interface/web/>
+    <Directory /var/www/ispconfig/>
       Options Indexes FollowSymLinks MultiViews +ExecCGI
       AllowOverride AuthConfig Indexes Limit Options FileInfo
       AddHandler fcgid-script .php
-      FCGIWrapper /usr/local/ispconfig/interface/bin/php-fcgi .php
+      FCGIWrapper /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter .php
       Order allow,deny
       Allow from all
     </Directory>
diff --git a/install/tpl/apache_ispconfig_fcgi_starter.master b/install/tpl/apache_ispconfig_fcgi_starter.master
new file mode 100644
index 000000000..001ca6e17
--- /dev/null
+++ b/install/tpl/apache_ispconfig_fcgi_starter.master
@@ -0,0 +1,8 @@
+#!/bin/sh
+PHPRC=/etc/php5/cgi/
+export PHPRC
+exec /usr/lib/cgi-bin/php
+PHP_FCGI_MAX_REQUESTS=5000
+export PHP_FCGI_MAX_REQUESTS
+export PHP_FCGI_CHILDREN=8
+export PHP_FCGI_MAX_REQUESTS=500
\ No newline at end of file
-- 
GitLab