From f6896b42428927cba691389a6bbd64f89245c8c6 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 31 Aug 2008 06:45:48 -0400
Subject: [PATCH] Changed apache configuration for fastcgi support.
---
server/conf/vhost.conf.master | 14 +++++++++-----
server/plugins-available/apache2_plugin.inc.php | 1 +
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/server/conf/vhost.conf.master b/server/conf/vhost.conf.master
index 220570e..a681b1d 100644
--- a/server/conf/vhost.conf.master
+++ b/server/conf/vhost.conf.master
@@ -47,12 +47,16 @@
AddType application/x-httpd-php .php .php3 .php4 .php5
</tmpl_if>
<tmpl_if name='php' op='==' value='fast-cgi'>
- # php as fast-cgi enabled
- AddType application/x-httpd-php .php .php3 .php4 .php5
-
- ScriptAlias <tmpl_var name='fastcgi_alias'> <tmpl_var name='fastcgi_starter_path'>
+ # php as fast-cgi enabled
+ <Directory /var/www/<tmpl_var name='domain'>/web>
+ AddHandler fcgid-script .php .php3 .php4 .php5
+ FCGIWrapper <tmpl_var name='fastcgi_starter_path'>/<tmpl_var name='fastcgi_starter_script'> .php
+ Options FollowSymLinks +ExecCGI Indexes
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+ </Directory>
</tmpl_if>
-
<tmpl_if name="rewrite_enabled">
RewriteEngine on
<tmpl_loop name="redirects">
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 7b46615..4160b1e 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -432,6 +432,7 @@
$tpl->setVar('fastcgi_alias',$fastcgi_config["fastcgi_alias"]);
$tpl->setVar('fastcgi_starter_path',$fastcgi_starter_path);
+ $tpl->setVar('fastcgi_starter_script',$fastcgi_config["fastcgi_starter_script"]);
}
--
Gitblit v1.9.1