From 9787a043c1372ab9dd1011928ef7105b0ff7b98c Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Tue, 27 Jan 2009 17:36:50 +0000
Subject: [PATCH] Fixed FCGI starter script for ispconfig interface.
---
install/lib/installer_base.lib.php | 1 +
install/tpl/apache_ispconfig.vhost.master | 4 ++--
interface/bin/php-fcgi | 10 ----------
3 files changed, 3 insertions(+), 12 deletions(-)
delete mode 100644 interface/bin/php-fcgi
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index c4cabd11a5..7999799e69 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -996,6 +996,7 @@ class installer_base {
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');
}
diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index d37b532b09..32dd4411bc 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -9,9 +9,8 @@ NameVirtualHost *:{vhost_port}
<VirtualHost _default_:{vhost_port}>
ServerAdmin webmaster@localhost
- DocumentRoot /usr/local/ispconfig/interface/web/
- <IfModule mod_fastcgi.c>
+ <IfModule mod_fcgid.c>
DocumentRoot /var/www/ispconfig/
SuexecUserGroup ispconfig ispconfig
<Directory /var/www/ispconfig/>
@@ -25,6 +24,7 @@ NameVirtualHost *:{vhost_port}
</IfModule>
<IfModule mod_php5.c>
+ DocumentRoot /usr/local/ispconfig/interface/web/
AddType application/x-httpd-php .php
<Directory /usr/local/ispconfig/interface/web>
Options FollowSymLinks
diff --git a/interface/bin/php-fcgi b/interface/bin/php-fcgi
deleted file mode 100644
index e09339df06..0000000000
--- a/interface/bin/php-fcgi
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-PHPRC="/etc/php5/cgi/"
-export PHPRC
-PHP_DOCUMENT_ROOT="/usr/local/ispconfig/interface/web/"
-export PHP_DOCUMENT_ROOT
-PHP_FCGI_CHILDREN=8
-export PHP_FCGI_CHILDREN
-PHP_FCGI_MAX_REQUESTS=5000
-export PHP_FCGI_MAX_REQUESTS
-exec /usr/bin/php-cgi $1
--
GitLab