From b0ebbdedaa0805599b97a9d3bbc96c0a5cf2bbac Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Sun, 21 Mar 2010 06:04:32 -0400
Subject: [PATCH] Fixed: FS#1124 - Traffic quota on some systems not working
---
install/tpl/apache_ispconfig.vhost.master | 69 +++++++++++++++++++++-------------
1 files changed, 43 insertions(+), 26 deletions(-)
diff --git a/install/tpl/apache_ispconfig.vhost.master b/install/tpl/apache_ispconfig.vhost.master
index 040d5ee..be1b7f8 100644
--- a/install/tpl/apache_ispconfig.vhost.master
+++ b/install/tpl/apache_ispconfig.vhost.master
@@ -4,35 +4,52 @@
# for the ISPConfig controlpanel
######################################################
-Listen 8080
-NameVirtualHost *:8080
+{vhost_port_listen} Listen {vhost_port}
+NameVirtualHost *:{vhost_port}
-<VirtualHost _default_:8080>
- ServerAdmin webmaster@localhost
+<VirtualHost _default_:{vhost_port}>
+ 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_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
-
+ 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
+
</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