From 9156cc5152fd3e5aa2aa898bcd8dbe4cd2cec44b Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 06 Mar 2013 06:06:26 -0500
Subject: [PATCH] - Added -idle-timeout 300 to FastCgiExternalServer directive in Apache vhost.

---
 install/tpl/apache_ispconfig.vhost.master |   97 ++++++++++++++++++++++++++++--------------------
 1 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index a6d2f45..0385427 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -4,53 +4,68 @@
 # for the ISPConfig controlpanel
 ######################################################
 
-Listen {vhost_port}
+{vhost_port_listen} Listen {vhost_port}
 NameVirtualHost *:{vhost_port}
 
 <VirtualHost _default_:{vhost_port}>
-	ServerAdmin webmaster@localhost
-    DocumentRoot /usr/local/ispconfig/interface/web/
-	
-	<IfModule mod_fastcgi.c>
-		<Location /php/php-fcgi>
-                	Options ExecCGI        
-                	SetHandler fastcgi-script
-       		</Location>
+  ServerAdmin webmaster@localhost
+  
+  <FilesMatch "\.ph(p3?|tml)$">
+    SetHandler None
+  </FilesMatch>
+  
+  <IfModule mod_fcgid.c>
+    DocumentRoot /var/www/ispconfig/
+    SuexecUserGroup ispconfig ispconfig
+    <Directory /var/www/ispconfig/>
+      Options Indexes FollowSymLinks MultiViews +ExecCGI
+      AllowOverride AuthConfig Indexes Limit Options FileInfo
+      AddHandler fcgid-script .php
+      FCGIWrapper /var/www/php-fcgi-scripts/ispconfig/.php-fcgi-starter .php
+      Order allow,deny
+      Allow from all
+    </Directory>
+    IPCCommTimeout  7200
+  </IfModule>
+  
+#  <IfModule mod_php5.c>
+#    DocumentRoot /usr/local/ispconfig/interface/web/
+#    AddType application/x-httpd-php .php
+#    <Directory /usr/local/ispconfig/interface/web>
+#      # php_admin_value open_basedir "/usr/local/ispconfig/interface:/usr/share:/tmp"
+#      Options FollowSymLinks
+#      AllowOverride None
+#      Order allow,deny
+#      Allow from all
+#	  php_value magic_quotes_gpc        0
+#    </Directory>
+#  </IfModule>
+  
+  # ErrorLog /var/log/apache2/error.log
+  # CustomLog /var/log/apache2/access.log combined
+  ServerSignature Off
+  
+  <IfModule mod_security2.c>
+    SecRuleEngine Off
+  </IfModule>
 
-        	Action php-fastcgi /php/php-fcgi
+  # SSL Configuration
+  {ssl_comment}SSLEngine On
+  {ssl_comment}SSLCertificateFile /usr/local/ispconfig/interface/ssl/ispserver.crt
+  {ssl_comment}SSLCertificateKeyFile /usr/local/ispconfig/interface/ssl/ispserver.key
+  {ssl_bundle_comment}SSLCACertificateFile /usr/local/ispconfig/interface/ssl/ispserver.bundle
 
-		ScriptAlias /php/ /usr/local/ispconfig/interface/bin/
-
-		<Directory "/usr/local/ispconfig/interface/bin/">
-                        AllowOverride None
-                        Options +ExecCGI -MultiViews -Indexes
-                        Order allow,deny
-                        Allow from all                              
-        	</Directory>
-	</IfModule>
-
-	<IfModule mod_php5.c>
-  		AddType application/x-httpd-php .php
-	</IfModule>
-	
-	<Directory /usr/local/ispconfig/interface/web/>
-		Options FollowSymLinks
-		AllowOverride None
-		Order allow,deny
-		Allow from all
-	</Directory>
-	
-	ErrorLog /var/log/apache2/error.log
-	CustomLog /var/log/apache2/access.log combined
-    ServerSignature Off
-	
 </VirtualHost>
 
-###########################################
-# Logfile configuration for vlogger
-###########################################
+<Directory /var/www/php-cgi-scripts>
+    AllowOverride None
+    Order Deny,Allow
+    Deny from all
+</Directory>
 
-LogFormat "%v %h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined_ispconfig
-CustomLog "| /usr/sbin/vlogger -s access.log /var/log/ispconfig/httpd" combined_ispconfig
-
+<Directory /var/www/php-fcgi-scripts>
+    AllowOverride None
+    Order Deny,Allow
+    Deny from all
+</Directory>
 

--
Gitblit v1.9.1