From 45b8e41fd93ffdfd67d3d900c77be16ac08f4e82 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 24 Apr 2009 06:25:11 -0400
Subject: [PATCH] Edited todo file.

---
 install/tpl/apache_ispconfig.vhost.master |   75 ++++++++++++++++++++-----------------
 1 files changed, 40 insertions(+), 35 deletions(-)

diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index 023fb43..be1b7f8 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -4,47 +4,52 @@
 # for the ISPConfig controlpanel
 ######################################################
 
-Listen {vhost_port}
+{vhost_port_listen} Listen {vhost_port}
 NameVirtualHost *:{vhost_port}
 
 <VirtualHost _default_:{vhost_port}>
-	ServerAdmin webmaster@localhost
+  ServerAdmin webmaster@localhost
+  
+  <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>
+  </IfModule>
+  
+  <IfModule mod_php5.c>
     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>
+    AddType application/x-httpd-php .php
+    <Directory /usr/local/ispconfig/interface/web>
+      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_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
-	
 </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