From e4e2a430bbbf2cd9516f4d01f2b49a10ff981d5c Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 27 Jan 2014 10:33:40 -0500
Subject: [PATCH] Merge branch 'master' into 'master'
---
install/tpl/apache_apps.vhost.master | 30 +++++++++++++++++-------------
1 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/install/tpl/apache_apps.vhost.master b/install/tpl/apache_apps.vhost.master
index 07e42a5..cfedb9e 100644
--- a/install/tpl/apache_apps.vhost.master
+++ b/install/tpl/apache_apps.vhost.master
@@ -11,6 +11,22 @@
ServerAdmin webmaster@localhost
{apps_vhost_servername}
+ <FilesMatch "\.ph(p3?|tml)$">
+ SetHandler None
+ </FilesMatch>
+
+ <IfModule mod_php5.c>
+ DocumentRoot {apps_vhost_dir}
+ AddType application/x-httpd-php .php
+ <Directory {apps_vhost_dir}>
+ # php_admin_value open_basedir "{apps_vhost_dir}:/usr/share:/tmp"
+ Options FollowSymLinks
+ AllowOverride None
+ Order allow,deny
+ Allow from all
+ </Directory>
+ </IfModule>
+
<IfModule mod_fcgid.c>
DocumentRoot {apps_vhost_dir}
SuexecUserGroup ispapps ispapps
@@ -19,23 +35,11 @@
AllowOverride AuthConfig Indexes Limit Options FileInfo
AddHandler fcgid-script .php
FCGIWrapper {website_basedir}/php-fcgi-scripts/apps/.php-fcgi-starter .php
+ # FcgidBusyTimeout 3600
Order allow,deny
Allow from all
</Directory>
</IfModule>
-
- <IfModule mod_php5.c>
- DocumentRoot {apps_vhost_dir}
- AddType application/x-httpd-php .php
- <Directory {apps_vhost_dir}>
- Options FollowSymLinks
- AllowOverride None
- Order allow,deny
- Allow from all
- </Directory>
- </IfModule>
-
- ServerSignature Off
</VirtualHost>
--
Gitblit v1.9.1