From bf50bc3ea2d8d32487bb73ef3017ec51e5183bb4 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sat, 27 Dec 2008 13:38:25 -0500
Subject: [PATCH] Updated installation instructions.

---
 install/tpl/apache_ispconfig.vhost.master |   73 +++++++++++++++---------------------
 1 files changed, 30 insertions(+), 43 deletions(-)

diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index a6d2f45..e9bfee5 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -4,53 +4,40 @@
 # 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
+  DocumentRoot /usr/local/ispconfig/interface/web/
+  
+  <IfModule mod_fastcgi.c>
+    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
+      AllowOverride None
+      Order allow,deny
+      Allow from all
+    </Directory>
+  </IfModule>
+  
+  <IfModule mod_php5.c>
+    AddType application/x-httpd-php .php
+    <Directory /usr/local/ispconfig/interface/web>
+      Options FollowSymLinks
+      AllowOverride None
+      Order allow,deny
+      Allow from all
+    </Directory>
+  </IfModule>
+  
+  # ErrorLog /var/log/apache2/error.log
+  # CustomLog /var/log/apache2/access.log combined
+  ServerSignature Off
 
-        	Action php-fastcgi /php/php-fcgi
-
-		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
-###########################################
-
-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
 
 

--
Gitblit v1.9.1